[LNT] r235655 - Make runtest tests more robust to changes in the example database

[Chris Matthews]

Author: cmatthews
Date: Thu Apr 23 17:24:16 2015
New Revision: 235655

URL: http://llvm.org/viewvc/llvm-project?rev=235655&view=rev
Log:
Make runtest tests more robust to changes in the example database

Modified:
    lnt/trunk/tests/runtest/multisample.py
    lnt/trunk/tests/runtest/nt.py
    lnt/trunk/tests/runtest/only_test.py

Modified: lnt/trunk/tests/runtest/multisample.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/multisample.py?rev=235655&r1=235654&r2=235655&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/multisample.py (original)
+++ lnt/trunk/tests/runtest/multisample.py Thu Apr 23 17:24:16 2015
@@ -13,7 +13,6 @@
 # CHECK-STDOUT: Added Machines: 1
 # CHECK-STDOUT: Added Runs    : 1
 # CHECK-STDOUT: Added Tests   : 130
-# CHECK-STDOUT: --- Tested: 260 tests --
 
 # CHECK-STDERR: inferred C++ compiler under test
 # CHECK-STDERR: (multisample) running iteration 0
@@ -28,5 +27,3 @@
 # CHECK-STDERR: generating report
 # CHECK-STDERR: (multisample) running iteration 1
 # CHECK-STDERR: submitting result to dummy instance
-
-

Modified: lnt/trunk/tests/runtest/nt.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/nt.py?rev=235655&r1=235654&r2=235655&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/nt.py (original)
+++ lnt/trunk/tests/runtest/nt.py Thu Apr 23 17:24:16 2015
@@ -9,13 +9,12 @@
 # RUN: FileCheck --check-prefix CHECK-STDOUT < %t.log %s
 # RUN: FileCheck --check-prefix CHECK-BASIC < %t.err %s
 # RUN: FileCheck --check-prefix CHECK-REPORT < %t.SANDBOX/build/report.json %s
-# CHECK-REPORT: "run_order": "154331" 
+# CHECK-REPORT: "run_order": "154331"
 #
 # CHECK-STDOUT: Import succeeded.
 # CHECK-STDOUT: Added Machines: 1
 # CHECK-STDOUT: Added Runs    : 1
 # CHECK-STDOUT: Added Tests   : 130
-# CHECK-STDOUT: --- Tested: 260 tests --
 #
 # CHECK-BASIC: inferred C++ compiler under test
 # CHECK-BASIC: checking source versions
@@ -45,7 +44,7 @@
 # RUN:   --cc %{shared_inputs}/FakeCompilers/clang-r154331 \
 # RUN:   --no-timestamp --run-order=123 > %t.log 2> %t.err
 # RUN: FileCheck --check-prefix CHECK-RESULTS < %t.SANDBOX/build/report.json %s
-# CHECK-RESULTS: "run_order": "123" 
+# CHECK-RESULTS: "run_order": "123"
 #
 # Change the machine name. Don't use LLVM.
 # RUN: lnt runtest nt \

Modified: lnt/trunk/tests/runtest/only_test.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/only_test.py?rev=235655&r1=235654&r2=235655&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/only_test.py (original)
+++ lnt/trunk/tests/runtest/only_test.py Thu Apr 23 17:24:16 2015
@@ -14,7 +14,6 @@
 # CHECK-STDOUT: Added Machines: 1
 # CHECK-STDOUT: Added Runs    : 1
 # CHECK-STDOUT: Added Tests   : 130
-# CHECK-STDOUT: --- Tested: 260 tests --
 
 # CHECK-STDERR: inferred C++ compiler under test
 # CHECK-STDERR: checking source versions
@@ -27,5 +26,3 @@
 # CHECK-STDERR: capturing machine information
 # CHECK-STDERR: generating report
 # CHECK-STDERR: submitting result to dummy instance
-
-