Merge lp:~gabipetrovay/zorba/moduleDocumentation into lp:zorba

Proposed by Gabriel Petrovay
Status: Superseded
Proposed branch: lp:~gabipetrovay/zorba/moduleDocumentation
Merge into: lp:zorba
Diff against target: 44 lines (+17/-5)
1 file modified
test/rbkt/Queries/CMakeLists.txt (+17/-5)
To merge this branch: bzr merge lp:~gabipetrovay/zorba/moduleDocumentation
Reviewer Review Type Date Requested Status
Gabriel Petrovay (community) Approve
Review via email: mp+78761@code.launchpad.net

Commit message

Disabled moduleDocumentation test due to 871335.

Description of the change

Disabled moduleDocumentation test due to 871335.

I guess this will not succeed because now the image module will not be changed. :(

To post a comment you must log in.
Revision history for this message
Gabriel Petrovay (gabipetrovay) :
review: Approve
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:~gabipetrovay/zorba/moduleDocumentation into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job moduleDocumentation-2011-10-09T15-41-28.913Z 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:~gabipetrovay/zorba/moduleDocumentation into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job moduleDocumentation-2011-10-09T15-51-15.827Z 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

10503. By Gabriel Petrovay

Disabled the moduleDocumentation test because of already commited modules with broken documentaiton which stop submitting other patches. It is the case of the image modules.

10504. By Gabriel Petrovay

The previous commit brakes the Windows build because a wrong EXPECTED_FAILURE has been commented out.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt 2011-10-09 01:05:46 +0000
+++ test/rbkt/Queries/CMakeLists.txt 2011-10-09 16:13:29 +0000
@@ -32,12 +32,21 @@
32# appropriate. IF YOU THINK YOU WANT TO DO THIS, YOU ARE PROBABLY32# appropriate. IF YOU THINK YOU WANT TO DO THIS, YOU ARE PROBABLY
33# WRONG OR THERE IS A SERIOUS PROBLEM WITH THE BUILD SYSTEM.33# WRONG OR THERE IS A SERIOUS PROBLEM WITH THE BUILD SYSTEM.
34# PLEASE DO NOT USE THIS MECHANISM IF AT ALL POSSIBLE.34# PLEASE DO NOT USE THIS MECHANISM IF AT ALL POSSIBLE.
35# IF STILL NEEDED, GIVE THE CORRESPONDING BUG PRIORITY 9 BECAUSE35# IF STILL NEEDED, GIVE THE CORRESPONDING BUG IMPORTANCE "CRITICAL"
36# THIS HAS TO BE ADDRESSED ASAP.36# BECAUSE THIS HAS TO BE ADDRESSED ASAP.
37LIST(REMOVE_ITEM TESTFILES37LIST(REMOVE_ITEM TESTFILES
3838
39# Crashes on Windows: 3284881, 3071699 (fix 3284881 before 3071699)39 # crashes on Windows: 866978, 866742 (fix 866978 before 866742)
40 zorba/HigherOrder/hof-101.xq40 zorba/HigherOrder/hof-101.xq
41
42 # fails because of the image external module's broken documentation
43 # If you try to submit something else to the external module, it will
44 # fail because of this test.
45 # If you try and mark it as expected failure here, the "expected failure"
46 # will fail because the image module will not be tested and therefore the
47 # module documentation test will succeed.
48 # Created bug 871335 for this.
49 zorba/xqdoc/moduleDocumentation.xq
41)50)
4251
43# collect all chained test queries (suffix .cxq) in all subdirectories52# collect all chained test queries (suffix .cxq) in all subdirectories
@@ -251,10 +260,13 @@
251260
252 EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)261 EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)
253 EXPECTED_FAILURE(test/rbkt/zorba/xqdoc/moduleDocumentation 871062)262 EXPECTED_FAILURE(test/rbkt/zorba/xqdoc/moduleDocumentation 871062)
254 263
255 EXPECTED_FAILURE(test/rbkt/zorba/file/createWriteReadDeleteSeries 3276394)264 # this is still an expected failure but has been commented out since the
265 # test is now completely disabled because of bug 871335
266 #EXPECTED_FAILURE(test/rbkt/zorba/file/createWriteReadDeleteSeries 866969)
256ENDIF(WIN32)267ENDIF(WIN32)
257268
269
258EXPECTED_FAILURE(test/rbkt/zorba/modules/schema 3131554)270EXPECTED_FAILURE(test/rbkt/zorba/modules/schema 3131554)
259271
260EXPECTED_FAILURE(test/rbkt/zorba/xqddf/ic-uniqueKey-err2 2935047)272EXPECTED_FAILURE(test/rbkt/zorba/xqddf/ic-uniqueKey-err2 2935047)

Subscribers

People subscribed via source and target branches