Merge lp:~zorba-coders/zorba/activate-zorba-with-json into lp:zorba

Proposed by Ghislain Fourny
Status: Merged
Approved by: Chris Hillery
Approved revision: 10953
Merged at revision: 10957
Proposed branch: lp:~zorba-coders/zorba/activate-zorba-with-json
Merge into: lp:zorba
Diff against target: 41 lines (+8/-1)
3 files modified
CMakeConfiguration.txt (+1/-1)
test/rbkt/Queries/CMakeLists.txt (+5/-0)
test/rbkt/Queries/w3c_known_failures.txt (+2/-0)
To merge this branch: bzr merge lp:~zorba-coders/zorba/activate-zorba-with-json
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Matthias Brantner Approve
Review via email: mp+116424@code.launchpad.net

Commit message

Activating ZORBA_WITH_JSON by default.

Description of the change

Activating ZORBA_WITH_JSON by default.

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

The attempt to merge lp:~zorba-coders/zorba/activate-zorba-with-json into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job activate-zorba-with-json-2012-07-24T09-12-08.437Z 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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/activate-zorba-with-json into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job activate-zorba-with-json-2012-07-24T13-22-03.574Z is
  finished. The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

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

The attempt to merge lp:~zorba-coders/zorba/activate-zorba-with-json into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job activate-zorba-with-json-2012-07-24T13-43-03.46Z 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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job activate-zorba-with-json-2012-07-26T16-39-07.76Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending.

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

The attempt to merge lp:~zorba-coders/zorba/activate-zorba-with-json into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job activate-zorba-with-json-2012-07-27T15-37-02.898Z 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 :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job activate-zorba-with-json-2012-07-27T16-59-06.253Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job activate-zorba-with-json-2012-07-27T20-50-10.079Z 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 'CMakeConfiguration.txt'
2--- CMakeConfiguration.txt 2012-07-24 08:48:48 +0000
3+++ CMakeConfiguration.txt 2012-07-27 15:40:29 +0000
4@@ -152,7 +152,7 @@
5 SET(ZORBA_WITH_BIG_INTEGER OFF CACHE BOOL "enable arbitrary precision integers")
6 MESSAGE(STATUS "ZORBA_WITH_BIG_INTEGER: " ${ZORBA_WITH_BIG_INTEGER})
7
8-SET(ZORBA_WITH_JSON OFF CACHE BOOL "enable integrated JSON support")
9+SET(ZORBA_WITH_JSON ON CACHE BOOL "enable integrated JSON support")
10 MESSAGE(STATUS "ZORBA_WITH_JSON: " ${ZORBA_WITH_JSON})
11
12 IF (ZORBA_SUPPRESS_SWIG)
13
14=== modified file 'test/rbkt/Queries/CMakeLists.txt'
15--- test/rbkt/Queries/CMakeLists.txt 2012-07-24 08:48:48 +0000
16+++ test/rbkt/Queries/CMakeLists.txt 2012-07-27 15:40:29 +0000
17@@ -254,6 +254,11 @@
18 EXPECTED_FAILURE (test/rbkt/w3c_testsuite/XQuery/Operators/CompExpr/ValComp/NumericComp/NumericGT/K2-NumericGT-2 867059)
19 ENDIF (NOT ZORBA_WITH_BIG_INTEGER)
20
21+ IF(ZORBA_WITH_JSON)
22+ # These tests fail because of the JSONiq extension which has array constructors.
23+ EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Expressions/SeqExpr/FilterExpr/K-FilterExpr-4 3141592)
24+ EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Expressions/SeqExpr/FilterExpr/K-FilterExpr-5 3141592)
25+ ENDIF(ZORBA_WITH_JSON)
26
27 IF (ZORBA_TEST_XQUERYX)
28
29
30=== modified file 'test/rbkt/Queries/w3c_known_failures.txt'
31--- test/rbkt/Queries/w3c_known_failures.txt 2012-07-24 08:48:48 +0000
32+++ test/rbkt/Queries/w3c_known_failures.txt 2012-07-27 15:40:29 +0000
33@@ -41,6 +41,8 @@
34 test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-7
35 test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-8
36 test/rbkt/w3c_testsuite/XQuery/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-10
37+test/rbkt/w3c_testsuite/XQuery/Expressions/SeqExpr/FilterExpr/K-FilterExpr-4
38+test/rbkt/w3c_testsuite/XQuery/Expressions/SeqExpr/FilterExpr/K-FilterExpr-5
39 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-001
40 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-002
41 test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007

Subscribers

People subscribed via source and target branches