<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Thanks. This is one of my first lit patches, that all makes sense. Here is an updated version:<div><br></div><div><div>Index: tests/runtest/nt.py</div><div>===================================================================</div><div>--- tests/runtest/nt.py<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 188243)</div><div>+++ tests/runtest/nt.py<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)</div><div>@@ -1,30 +1,74 @@</div><div> # Testing for the 'lnt runtest nt' module.</div><div> #</div><div>+# Check a basic nt run.</div><div> # RUN: lnt runtest nt \</div><div> # RUN: --sandbox %t.SANDBOX \</div><div> # RUN: --test-suite %S/Inputs/test-suite \</div><div> # RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div> # RUN: --no-timestamp > %t.log 2> %t.err</div><div>-#</div><div> # RUN: FileCheck --check-prefix CHECK-STDOUT < %t.log %s</div><div>-# RUN: FileCheck --check-prefix CHECK-STDERR < %t.err %s</div><div>+# RUN: FileCheck --check-prefix CHECK-BASIC < %t.err %s</div><div>+# RUN: FileCheck --check-prefix CHECK-REPORT < %t.SANDBOX/build/report.json %s</div><div>+# CHECK-REPORT: "run_order": "154331" </div><div> #</div><div> # CHECK-STDOUT: Import succeeded.</div><div> # CHECK-STDOUT: Added Machines: 1</div><div> # CHECK-STDOUT: Added Runs : 1</div><div> # CHECK-STDOUT: Added Tests : 130</div><div> # CHECK-STDOUT: --- Tested: 260 tests --</div><div>+#</div><div>+# CHECK-BASIC: inferred C++ compiler under test</div><div>+# CHECK-BASIC: checking source versions</div><div>+# CHECK-BASIC: using nickname</div><div>+# CHECK-BASIC: starting test</div><div>+# CHECK-BASIC: configuring</div><div>+# CHECK-BASIC: building test-suite tools</div><div>+# CHECK-BASIC: executing "nightly tests" with -j1</div><div>+# CHECK-BASIC: loading nightly test data</div><div>+# CHECK-BASIC: capturing machine information</div><div>+# CHECK-BASIC: generating report</div><div>+# CHECK-BASIC: submitting result to dummy instance</div><div>+#</div><div>+# Use the same sandbox again with --no-configure</div><div>+# RUN: lnt runtest nt \</div><div>+# RUN: --sandbox %t.SANDBOX \</div><div>+# RUN: --test-suite %S/Inputs/test-suite \</div><div>+# RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div>+# RUN: --no-timestamp --no-configure > %t.log 2> %t.err</div><div>+# RUN: FileCheck --check-prefix CHECK-NOCONF < %t.err %s</div><div>+# CHECK-NOCONF-NOT: configuring</div><div>+#</div><div>+# Manually set a run order.</div><div>+# RUN: lnt runtest nt \</div><div>+# RUN: --sandbox %t.SANDBOX \</div><div>+# RUN: --test-suite %S/Inputs/test-suite \</div><div>+# RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div>+# RUN: --no-timestamp --run-order=123 > %t.log 2> %t.err</div><div>+# RUN: FileCheck --check-prefix CHECK-RESULTS < %t.SANDBOX/build/report.json %s</div><div>+# CHECK-RESULTS: "run_order": "123" </div><div>+#</div><div>+# Change the machine name. Don't use LLVM.</div><div>+# RUN: lnt runtest nt \</div><div>+# RUN: --sandbox %t.SANDBOX \</div><div>+# RUN: --test-suite %S/Inputs/test-suite \</div><div>+# RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div>+# RUN: --no-auto-name foo > %t.log 2> %t.err</div><div>+# RUN: FileCheck --check-prefix CHECK-AUTONAME < %t.err %s</div><div>+# CHECK-AUTONAME: using nickname: 'foo'</div><div>+#</div><div>+# Run with sandboxing enabled.</div><div>+# RUN: lnt runtest nt \</div><div>+# RUN: --sandbox %t.SANDBOX \</div><div>+# RUN: --test-suite %S/Inputs/test-suite \</div><div>+# RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div>+# RUN: --no-timestamp --use-isolation > %t.log 2> %t.err</div><div>+# RUN: FileCheck --check-prefix CHECK-SANDBOX < %t.err %s</div><div>+#</div><div>+# CHECK-SANDBOX: creating sandbox profile</div><div> </div><div>-# CHECK-STDERR: inferred C++ compiler under test</div><div>-# CHECK-STDERR: checking source versions</div><div>-# CHECK-STDERR: using nickname</div><div>-# CHECK-STDERR: starting test</div><div>-# CHECK-STDERR: configuring</div><div>-# CHECK-STDERR: building test-suite tools</div><div>-# CHECK-STDERR: executing "nightly tests" with -j1</div><div>-# CHECK-STDERR: loading nightly test data</div><div>-# CHECK-STDERR: capturing machine information</div><div>-# CHECK-STDERR: generating report</div><div>-# CHECK-STDERR: submitting result to dummy instance</div><div>-</div><div>-</div><div>+# Run without LLVM.</div><div>+# RUN: lnt runtest nt \</div><div>+# RUN: --sandbox %t.SANDBOX \</div><div>+# RUN: --test-suite %S/Inputs/test-suite \</div><div>+# RUN: --cc %{shared_inputs}/FakeCompilers/clang-r154331 \</div><div>+# RUN: --no-timestamp --without-llvm > %t.log 2> %t.err</div><div><br></div><div></div></div></body></html>