Merge lp:~zorba-coders/zorba/fix-big-integer into lp:zorba

Proposed by Chris Hillery
Status: Superseded
Proposed branch: lp:~zorba-coders/zorba/fix-big-integer
Merge into: lp:zorba
Diff against target: 11 lines (+0/-1)
1 file modified
CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix-big-integer
Reviewer Review Type Date Requested Status
Zorba Coders Pending
Review via email: mp+87443@code.launchpad.net

Commit message

Ensure clean test run when Zorba built with ZORBA_WITH_BIG_INTEGER.

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/fix-big-integer into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:273 (message):
  Validation queue job fix-big-integer-2012-01-04T09-15-05.17Z 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

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-12-21 14:40:33 +0000
3+++ CMakeLists.txt 2012-01-04 09:18:25 +0000
4@@ -16,7 +16,6 @@
5 ENABLE_TESTING()
6 INCLUDE(CTest)
7
8-
9 # overwriting the source and binary directories with the current zorba ones
10 # this is usefull for other projects reusing zorba as a subcomponent
11 SET(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

Subscribers

People subscribed via source and target branches