Zorba

Merge lp:~zorba-coders/zorba/new-rq-fots into lp:zorba

  1. new-rq-fots
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 11542
Merged at revision: 11543
Proposed branch: lp:~zorba-coders/zorba/new-rq-fots
Merge into: lp:zorba
Diff against target: 72 lines (+21/-19)
3 files modified
CTestCustom.cmake (+2/-2)
test/driver/testdriver_mt.cpp (+1/-1)
test/fots/CMakeLists.txt (+18/-16)
To merge this branch: bzr merge lp:~zorba-coders/zorba/new-rq-fots
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+171053@code.launchpad.net

Commit message

Re-enabling tests which pass on the new RQ machine.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-rq-fots-2013-06-27T22-16-59.386Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/new-rq-fots into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:281 (message):
  Validation queue job new-rq-fots-2013-06-27T22-16-59.386Z is finished. The
  final status was:

  4 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-rq-fots-2013-06-27T23-24-57.14Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/new-rq-fots into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:284 (message):
  Validation queue job new-rq-fots-2013-06-27T23-24-57.14Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-rq-fots-2013-06-28T00-41-49.32Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/new-rq-fots into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:284 (message):
  Validation queue job new-rq-fots-2013-06-28T00-41-49.32Z is finished. The
  final status was:

  2 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-rq-fots-2013-06-28T01-32-53.002Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job new-rq-fots-2013-06-28T01-32-53.002Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CTestCustom.cmake'
2--- CTestCustom.cmake 2013-02-07 17:24:36 +0000
3+++ CTestCustom.cmake 2013-06-27 23:18:29 +0000
4@@ -14,8 +14,8 @@
5
6 # do not take mapm into the coverage analysis
7 SET (CTEST_CUSTOM_COVERAGE_EXCLUDE "mapm.*")
8-SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 8192)
9-SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 8192)
10+SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1048576)
11+SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 102400)
12
13 # other possible options
14 # CTEST_CUSTOM_ERROR_MATCH Regular expression for errors during build process
15
16=== modified file 'test/driver/testdriver_mt.cpp'
17--- test/driver/testdriver_mt.cpp 2013-05-16 08:22:46 +0000
18+++ test/driver/testdriver_mt.cpp 2013-06-27 23:18:29 +0000
19@@ -989,7 +989,7 @@
20 #if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2
21 queries.theResultsDir = path.native_directory_string();
22 #else
23- queries.theResultsDir = path.parent_path().generic_string();
24+ queries.theResultsDir = path.generic_string();
25 #endif
26
27 //
28
29=== modified file 'test/fots/CMakeLists.txt'
30--- test/fots/CMakeLists.txt 2013-06-24 09:58:08 +0000
31+++ test/fots/CMakeLists.txt 2013-06-27 23:18:29 +0000
32@@ -108,22 +108,24 @@
33 EXPECTED_FOTS_FAILURE (SLOW fn-subsequence cbcl-subsequence-014 1069794)
34 EXPECTED_FOTS_FAILURE (SLOW fn-matches.re re00987 1131313)
35 EXPECTED_FOTS_FAILURE (SLOW app-Demos itunes 0)
36-# Next 4 possibly unique to old RQ machine, but they need to be
37-# marked for the RQ to pass. Will not be run but marked as passing.
38-EXPECTED_FOTS_FAILURE (SLOW app-CatalogCheck Catalog002 0)
39-EXPECTED_FOTS_FAILURE (SLOW app-FunctxFn functx-fn-tokenize-7 0)
40-EXPECTED_FOTS_FAILURE (SLOW app-FunctxFn functx-fn-tokenize-all 0)
41-EXPECTED_FOTS_FAILURE (SLOW prod-EQName eqname-010 0)
42-EXPECTED_FOTS_FAILURE (SLOW prod-EQName eqname-011 0)
43-
44-#The following test-cases fail because fn:available-environment-variables does not return ()
45-#However thy all pass if one sets the following environment variables (on Linux):
46-# export QTTEST='42'
47-# export QTTEST2='other'
48-EXPECTED_FOTS_FAILURE (SLOW fn-available-environment-variables fn-available-environment-variables-011 1187692)
49-EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-005 1187692)
50-EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-006 1187692)
51-EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-007 1187692)
52+
53+# Couple tests that don't work on the old RQ machine.
54+IF (ZORBA_OLD_RQ_MACHINE)
55+ EXPECTED_FOTS_FAILURE (SLOW app-CatalogCheck Catalog002 0)
56+ EXPECTED_FOTS_FAILURE (SLOW app-FunctxFn functx-fn-tokenize-7 0)
57+ EXPECTED_FOTS_FAILURE (SLOW app-FunctxFn functx-fn-tokenize-all 0)
58+ENDIF (ZORBA_OLD_RQ_MACHINE)
59+
60+# The following test-cases will fail by default.
61+# However they all pass if one sets the following environment variables:
62+# QTTEST='42'
63+# QTTEST2='other'
64+# QTEMPTY=''
65+# The remote queue machine does this.
66+#EXPECTED_FOTS_FAILURE (SLOW fn-available-environment-variables fn-available-environment-variables-011 1187692)
67+#EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-005 1187692)
68+#EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-006 1187692)
69+#EXPECTED_FOTS_FAILURE (SLOW fn-environment-variable environment-variable-007 1187692)
70
71 #"crashing/hanging" tests. These are not run but marked as 'tooBig' by FOTS driver.
72 EXPECTED_FOTS_FAILURE (CRASH fn-matches.re re00975 1070533)

Subscribers

People subscribed via source and target branches