[LNT] r255962 - Fix output compares from logging change

[Chris Matthews via llvm-commits]

Author: cmatthews
Date: Thu Dec 17 19:44:52 2015
New Revision: 255962

URL: http://llvm.org/viewvc/llvm-project?rev=255962&view=rev
Log:
Fix output compares from logging change

Modified:
    lnt/trunk/tests/runtest/nt.py
    lnt/trunk/tests/runtest/rerun.py
    lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py

Modified: lnt/trunk/tests/runtest/nt.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/nt.py?rev=255962&r1=255961&r2=255962&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/nt.py (original)
+++ lnt/trunk/tests/runtest/nt.py Thu Dec 17 19:44:52 2015
@@ -174,7 +174,7 @@
 # CHECK-SUBMIT-STDERR: capturing machine information
 # CHECK-SUBMIT-STDERR: generating report
 # CHECK-SUBMIT-STDERR: submitting result to
-# CHECK-SUBMIT-STDERR: note: Rerunning 0 of 69 benchmarks.
+# CHECK-SUBMIT-STDERR: Rerunning 0 of 69 benchmarks.
 
 # Check submission to a server through server instance works:
 # RUN: rsync -av --exclude .svn %S/Inputs/rerun_server_instance/ \

Modified: lnt/trunk/tests/runtest/rerun.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/runtest/rerun.py?rev=255962&r1=255961&r2=255962&view=diff
==============================================================================
--- lnt/trunk/tests/runtest/rerun.py (original)
+++ lnt/trunk/tests/runtest/rerun.py Thu Dec 17 19:44:52 2015
@@ -30,7 +30,7 @@
 # CHECK-STDERR: capturing machine information
 # CHECK-STDERR: generating report
 # CHECK-STDERR: submitting result to
-# CHECK-STDERR: note: Rerunning 0 of 69 benchmarks.
+# CHECK-STDERR: Rerunning 0 of 69 benchmarks.
 
 # RUN: %S/Inputs/runtest_server_wrapper.sh \
 # RUN:   %{test_exec_root}/runtest/rerun_server_instance nt yes 9090 \
@@ -56,9 +56,9 @@
 # CHECK-STDERR2: loading nightly test data
 # CHECK-STDERR2: capturing machine information
 # CHECK-STDERR2: generating report
-# CHECK-STDERR2: note: Rerunning 3 of 69 benchmarks.
-# CHCCK-SDTERR2: note: Rerunning: ms_struct-bitfield [1/3]
-# CHCCK-SDTERR2: note: Rerunning: ms_struct_pack_layout-1 [2/3]
-# CHCCK-SDTERR2: note: Rerunning: vla [3/3]
+# CHECK-STDERR2: Rerunning 3 of 69 benchmarks.
+# CHCCK-SDTERR2: Rerunning: ms_struct-bitfield [1/3]
+# CHCCK-SDTERR2: Rerunning: ms_struct_pack_layout-1 [2/3]
+# CHCCK-SDTERR2: Rerunning: vla [3/3]
 
 # CHECK-STDERR2: submitting result to

Modified: lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py?rev=255962&r1=255961&r2=255962&view=diff
==============================================================================
--- lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py (original)
+++ lnt/trunk/tests/server/db/CreateV4TestSuiteInstance.py Thu Dec 17 19:44:52 2015
@@ -8,6 +8,7 @@ import datetime
 from lnt.server.config import Config
 from lnt.server.db import testsuite
 from lnt.server.db import v4db
+from lnt.server.db.fieldchange import RegressionState
 
 # Create an in memory database.
 db = v4db.V4DB("sqlite:///:memory:", Config.dummyInstance(), echo=True)
@@ -60,7 +61,7 @@ ts_db.add(field_change2)
 
 TEST_TITLE = "Some regression title"
 
-regression = ts_db.Regression(TEST_TITLE, "PR1234")
+regression = ts_db.Regression(TEST_TITLE, "PR1234", RegressionState.DETECTED)
 ts_db.add(regression)
 
 regression_indicator1 = ts_db.RegressionIndicator(regression, field_change)