<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">This patch updates the runtest lit test cases to cover two extra code paths, —multisample and —only-test.<div><br></div><div><br></div><div><div>Index: tests/runtest/Inputs/test-suite/configure</div><div>===================================================================</div><div>--- tests/runtest/Inputs/test-suite/configure<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 187526)</div><div>+++ tests/runtest/Inputs/test-suite/configure<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)</div><div>@@ -6,6 +6,7 @@</div><div> </div><div> echo "Copying in Makefile..."</div><div> cp $SRC_PATH/Makefile .</div><div>+cp $SRC_PATH/subtest/Makefile ./subtest/</div><div> </div><div> echo "Creating Makefile.config..."</div><div> echo "PROJ_SRC_ROOT = \"${SRC_PATH}\"" > Makefile.config</div><div>Index: tests/runtest/Inputs/test-suite/subtest/Makefile</div><div>===================================================================</div><div>--- tests/runtest/Inputs/test-suite/subtest/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 0)</div><div>+++ tests/runtest/Inputs/test-suite/subtest/Makefile<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)</div><div>@@ -0,0 +1,13 @@</div><div>+# Fake makefile</div><div>+</div><div>+include ../Makefile.config</div><div>+</div><div>+tools:</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>echo "This is a fake tools build."</div><div>+</div><div>+report:</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>echo "This is a fake report build."</div><div>+.PHONY: report</div><div>+</div><div>+report.simple.csv: report</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>cp ${PROJ_SRC_ROOT}/fake-report.simple.csv $@</div><div>Index: tests/runtest/multisample.py</div><div>===================================================================</div><div>--- tests/runtest/multisample.py<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 0)</div><div>+++ tests/runtest/multisample.py<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)</div><div>@@ -0,0 +1,32 @@</div><div>+# Testing for the 'lnt runtest nt' module.</div><div>+#</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 --multisample 2 > %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>+#</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-STDERR: inferred C++ compiler under test</div><div>+# CHECK-STDERR: (multisample) running iteration 0</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: (multisample) running iteration 1</div><div>+# CHECK-STDERR: submitting result to dummy instance</div><div>+</div><div>+</div><div>Index: tests/runtest/only_test.py</div><div>===================================================================</div><div>--- tests/runtest/only_test.py<span class="Apple-tab-span" style="white-space:pre"> </span>(revision 0)</div><div>+++ tests/runtest/only_test.py<span class="Apple-tab-span" style="white-space:pre"> </span>(working copy)</div><div>@@ -0,0 +1,31 @@</div><div>+# Testing for the 'lnt runtest nt' module.</div><div>+#</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: --only-test subtest \</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>+#</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-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><div><br></div><div></div></body></html>