[LNT] r308864 - lnt/tests: Fix more --commit flags, test them.

Matthias Braun via llvm-commits llvm-commits at lists.llvm.org
Sun Jul 23 23:46:43 PDT 2017


Author: matze
Date: Sun Jul 23 23:46:42 2017
New Revision: 308864

URL: http://llvm.org/viewvc/llvm-project?rev=308864&view=rev
Log:
lnt/tests: Fix more --commit flags, test them.

- Fix more --commit flags similar to r308862
- Add --commit flags to some tests
  (fun fact: The flags have always been wrongly implemented for
   `lnt runtest` and will always commit even for --commit 0. But I'm not
   gonna fix this now with D35588 around)
- tests/runtest/nt.py: Fix test failing when run in isolation
- Add --commit 1 flag to the test so we test the flag used on some
  buildbots.

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

Modified: lnt/trunk/lnt/tests/compile.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/compile.py?rev=308864&r1=308863&r2=308864&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/compile.py (original)
+++ lnt/trunk/lnt/tests/compile.py Sun Jul 23 23:46:42 2017
@@ -1051,9 +1051,8 @@ class CompileTest(builtintest.BuiltinTes
               help=("autosubmit the test result to the given server "
                     "(or local instance)"),
               type=click.UNPROCESSED, default=None)
- at click.option("--commit", "commit",
-              help="whether the autosubmit result should be committed",
-              type=int, default=True)
+ at click.option("--commit", "commit", is_flag=True, default=True,
+              help="whether the autosubmit result should be committed")
 @click.option("--output", "output", metavar="PATH",
               help="write raw report data to PATH (or stdout if '-')")
 @click.option("-v", "--verbose", "verbose",

Modified: lnt/trunk/lnt/tests/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/tests/test_suite.py?rev=308864&r1=308863&r2=308864&view=diff
==============================================================================
--- lnt/trunk/lnt/tests/test_suite.py (original)
+++ lnt/trunk/lnt/tests/test_suite.py Sun Jul 23 23:46:42 2017
@@ -1049,9 +1049,8 @@ class TestSuiteTest(BuiltinTest):
               help="autosubmit the test result to the given server"
                    " (or local instance)",
               type=click.UNPROCESSED, default=None)
- at click.option("--commit", "commit",
-              help="whether the autosubmit result should be committed",
-              type=int, default=True)
+ at click.option("--commit", "commit", is_flag=True, default=True,
+              help="whether the autosubmit result should be committed")
 @click.option("--output", "output", metavar="PATH",
               help="write raw report data to PATH (or stdout if '-')",
               default=None)

Modified: lnt/trunk/tests/runtest/nt.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/nt.py?rev=308864&r1=308863&r2=308864&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/nt.py (original)
+++ lnt/trunk/tests/runtest/nt.py Sun Jul 23 23:46:42 2017
@@ -149,6 +149,8 @@
 # CHECK-QEMU-FLAG1: QEMU_USER_MODE_COMMAND: TEST -soundhw gus -net nic -device gus,irq=5 '-test=escaped space' '-some-option=stay with me'
 
 # Check submission to a server through url works:
+# RUN: rm -rf %{test_exec_root}/runtest/nt_server_instance
+# RUN: mkdir -p %{test_exec_root}/runtest/nt_server_instance
 # RUN: rsync -av --exclude .svn %S/Inputs/rerun_server_instance/ \
 # RUN:   %{test_exec_root}/runtest/nt_server_instance
 # RUN: %{shared_inputs}/server_wrapper.sh \
@@ -183,6 +185,7 @@
 # RUN: %{shared_inputs}/server_wrapper.sh \
 # RUN:   %{test_exec_root}/runtest/nt_server_instance 9089 \
 # RUN:   lnt runtest nt --submit "http://localhost:9089/db_default/submitRun" \
+# RUN:   --commit 1 \
 # RUN:   --sandbox %t.SANDBOX \
 # RUN:   --test-suite %S/Inputs/rerun-test-suite1 \
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \

Modified: lnt/trunk/tests/runtest/test_suite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/test_suite.py?rev=308864&r1=308863&r2=308864&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/test_suite.py (original)
+++ lnt/trunk/tests/runtest/test_suite.py Sun Jul 23 23:46:42 2017
@@ -367,6 +367,7 @@
 # RUN:     -j2 \
 # RUN:     --exec-multisample=2 \
 # RUN:     --verbose \
+# RUN:     --commit 1 \
 # RUN:     > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-USE-PERF-ALL < %t.err %s
 # CHECK-USE-PERF-ALL: Configuring with {




More information about the llvm-commits mailing list