Merge lp:~zorba-coders/zorba/rq-xerces-311 into lp:zorba

Proposed by Chris Hillery
Status: Merged
Approved by: Juan Zacarias
Approved revision: 11408
Merged at revision: 11407
Proposed branch: lp:~zorba-coders/zorba/rq-xerces-311
Merge into: lp:zorba
Diff against target: 42 lines (+4/-3)
2 files modified
doc/zorba/build_prerequisites.dox (+3/-1)
test/fots/CMakeLists.txt (+1/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/rq-xerces-311
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+160781@code.launchpad.net

Commit message

Any test changes necessary due to upgrading the RQ to Xerces 3.1.1.

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/rq-xerces-311 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job rq-xerces-311-2013-04-25T01-02-41.386Z 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

lp:~zorba-coders/zorba/rq-xerces-311 updated
11408. By Chris Hillery

Removed one EXPECTED_FOTS_FAILURE() that now works with Xerces-C 3.1.1.
Added note regarding Xerces-C version support to documentation.

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
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 rq-xerces-311-2013-04-25T01-33-39.33Z 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 'doc/zorba/build_prerequisites.dox'
2--- doc/zorba/build_prerequisites.dox 2013-02-07 17:24:36 +0000
3+++ doc/zorba/build_prerequisites.dox 2013-04-25 01:30:37 +0000
4@@ -45,7 +45,9 @@
5 (http://xerces.apache.org/xerces-c/). This package is required to
6 enable XML schema support. This feature is enabled by default. In
7 order to disable XML schema support, you need to provide the CMake
8- configuration parameter \c ZORBA_NO_XMLSCHEMA=ON.
9+ configuration parameter \c ZORBA_NO_XMLSCHEMA=ON. Note that the Zorba
10+ team tests with Xerces-C 3.1.1. Xerces-C 2.8.0 in particular is known
11+ to cause a few bugs with schema handling.
12
13 - ICU4C 3.6 or later (http://www.icu-project.org/). This package is
14 required to enable Unicode support as well as some other
15
16=== modified file 'test/fots/CMakeLists.txt'
17--- test/fots/CMakeLists.txt 2013-04-24 18:26:40 +0000
18+++ test/fots/CMakeLists.txt 2013-04-25 01:30:37 +0000
19@@ -58,7 +58,6 @@
20 ENDIF (EXISTS "${_fotsscript}")
21 ENDIF (NOT _fotsscript STREQUAL "")
22
23-
24 # Customized macro for FOTS tests
25 MACRO (expected_fots_failure)
26 PARSE_ARGUMENTS (EFF "" "" "SLOW;CRASH;DISPUTED" ${ARGN})
27@@ -98,6 +97,7 @@
28 ${test_case} ${bugid} "${_notrun}" "${_finalStatus}" "${_disputed}")
29 ENDMACRO (expected_fots_failure)
30
31+
32 ##
33 ## Place all known failing FOTS tests here!
34 ##
35@@ -139,7 +139,6 @@
36 # marked for the RQ to pass.
37 EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-tokenize-7 0)
38 EXPECTED_FOTS_FAILURE (app-FunctxFn functx-fn-tokenize-all 0)
39-EXPECTED_FOTS_FAILURE (prod-CastExpr CastAsNamespaceSensitiveType-10 0)
40
41 # This test passes on the old and new RQ machines, but fails for Sorin.
42 #EXPECTED_FOTS_FAILURE (fn-normalize-unicode fn-normalize-unicode-11 0)

Subscribers

People subscribed via source and target branches