Zorba

Merge lp:~zorba-coders/zorba/fix-import-fots into lp:zorba

  1. fix-import-fots
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 11298
Merged at revision: 11297
Proposed branch: lp:~zorba-coders/zorba/fix-import-fots
Merge into: lp:zorba
Diff against target: 31 lines (+1/-9)
2 files modified
test/fots/CMakeLists.txt (+0/-8)
test/fots/ImportFOTS.cmake (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/fix-import-fots
Reviewer Review Type Date Requested Status
Paul J. Lucas Approve
Chris Hillery Approve
Review via email: mp+154533@code.launchpad.net

Commit message

Fix erroneous ELSEIF() condition.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Paul J. Lucas (paul-lucas) :
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/fix-import-fots-2013-03-20T22-20-39.169Z/log.html

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

The attempt to merge lp:~zorba-coders/zorba/fix-import-fots 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 fix-import-fots-2013-03-20T22-20-39.169Z 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

lp:~zorba-coders/zorba/fix-import-fots updated
11298. By Chris Hillery

FOTS progressions that were missed while RQ was broken.

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/fix-import-fots-2013-03-20T22-52-37.809Z/log.html

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

Validation queue job fix-import-fots-2013-03-20T22-52-37.809Z 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
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-03-20 06:58:59 +0000
+++ test/fots/CMakeLists.txt 2013-03-20 22:52:22 +0000
@@ -479,14 +479,6 @@
479EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)479EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0)
480EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)480EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0)
481EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)481EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0)
482EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-004 1157567)
483EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-005 1157567)
484EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-009 1157567)
485EXPECTED_FOTS_FAILURE (op-time-greater-than cbcl-time-greater-than-010 1157567)
486EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-004 1157567)
487EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-005 1157567)
488EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-009 1157567)
489EXPECTED_FOTS_FAILURE (op-time-less-than cbcl-time-less-than-010 1157567)
490EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)482EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0)
491EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)483EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0)
492EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)484EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0)
493485
=== modified file 'test/fots/ImportFOTS.cmake'
--- test/fots/ImportFOTS.cmake 2013-03-20 07:23:34 +0000
+++ test/fots/ImportFOTS.cmake 2013-03-20 22:52:22 +0000
@@ -29,7 +29,7 @@
29SET (_outdir "${BUILDDIR}/test/fots")29SET (_outdir "${BUILDDIR}/test/fots")
30IF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")30IF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
31 MESSAGE (STATUS "FOTS archive '${FOTS_ARCHIVE}' already downloaded.")31 MESSAGE (STATUS "FOTS archive '${FOTS_ARCHIVE}' already downloaded.")
32ELSEIF(EXISTS "${_outdir}/${FOTS_ARCHIVE}")32ELSE(EXISTS "${_outdir}/${FOTS_ARCHIVE}")
33 MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")33 MESSAGE (STATUS "Downloading FOTS archive '${FOTS_ARCHIVE}'...")
34 FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}34 FILE (DOWNLOAD http://zorbatest.lambda.nu:8080/~spungi/${FOTS_ARCHIVE}
35 "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)35 "${_outdir}/${FOTS_ARCHIVE}" STATUS _dlstat SHOW_PROGRESS)

Subscribers

People subscribed via source and target branches