[LNT] r261848 - [test-suite] Support arguments to --run-under, instead of just a single executable

James Molloy via llvm-commits llvm-commits at lists.llvm.org
Thu Feb 25 02:04:40 PST 2016


Author: jamesm
Date: Thu Feb 25 04:04:40 2016
New Revision: 261848

URL: http://llvm.org/viewvc/llvm-project?rev=261848&view=rev
Log:
[test-suite] Support arguments to --run-under, instead of just a single executable

Modified:
    lnt/trunk/lnt/tests/test_suite.py
    lnt/trunk/tests/runtest/test_suite.py

Modified: lnt/trunk/lnt/tests/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/test_suite.py?rev=261848&r1=261847&r2=261848&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/test_suite.py (original)
+++ lnt/trunk/lnt/tests/test_suite.py Thu Feb 25 04:04:40 2016
@@ -220,8 +220,9 @@ class TestSuiteTest(BuiltinTest):
         if not isexecfile(opts.lit):
             parser.error("LIT tool not found (looked for %s)" % opts.lit)
         if opts.run_under:
-            opts.run_under = resolve_command_path(opts.run_under)
-            if not isexecfile(opts.run_under):
+            split = shlex.split(opts.run_under)
+            split[0] = resolve_command_path(split[0])
+            if not isexecfile(split[0]):
                 parser.error("Run under wrapper not found (looked for %s)" %
                              opts.run_under)
                 

Modified: lnt/trunk/tests/runtest/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite.py?rev=261848&r1=261847&r2=261848&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite.py (original)
+++ lnt/trunk/tests/runtest/test_suite.py Thu Feb 25 04:04:40 2016
@@ -199,6 +199,20 @@
 # RUN: FileCheck --check-prefix CHECK-RUNUNDER2 < %t.err %s
 # CHECK-RUNUNDER2: TEST_SUITE_RUN_UNDER: '{{.*}}/fake-make'
 
+# Use a run-under command with an argument
+# RUN: lnt runtest test-suite \
+# RUN:     --sandbox %t.SANDBOX \
+# RUN:     --no-timestamp \
+# RUN:     --test-suite %S/Inputs/test-suite-cmake \
+# RUN:     --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
+# RUN:     --use-cmake %S/Inputs/test-suite-cmake/fake-cmake \
+# RUN:     --use-make %S/Inputs/test-suite-cmake/fake-make \
+# RUN:     --use-lit %S/Inputs/test-suite-cmake/fake-lit \
+# RUN:     --run-under '%S/Inputs/test-suite-cmake/fake-make wibble' \
+# RUN:     > %t.log 2> %t.err
+# RUN: FileCheck --check-prefix CHECK-RUNUNDER3 < %t.err %s
+# CHECK-RUNUNDER3: TEST_SUITE_RUN_UNDER: '{{.*}}/fake-make wibble'
+
 # Check --only-test
 # RUN: lnt runtest test-suite \
 # RUN:     --sandbox %t.SANDBOX \




More information about the llvm-commits mailing list