Zorba

Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

  1. bug-fixing
  2. Merge into trunk
Proposed by Matthias Brantner
Status: Merged
Approved by: Chris Hillery
Approved revision: no longer in the revision history of the source branch.
Merged at revision: 10486
Proposed branch: lp:~matthias-brantner/zorba/bug-fixing
Merge into: lp:zorba
Diff against target: 18 lines (+1/-7)
1 file modified
cmake_modules/ZorbaModule.cmake (+1/-7)
To merge this branch: bzr merge lp:~matthias-brantner/zorba/bug-fixing
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Review via email: mp+78019@code.launchpad.net

Commit message

fix if Zorba is built with a different store (name of the tests contained a suffix that doesn't exist anymore)

Description of the change

fix if Zorba is built with a different store (name of the tests contained a suffix that doesn't exist anymore)

To post a comment you must log in.
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/bug-fixing-2011-10-03T23-12-08.546Z/log.html

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

Validation queue job bug-fixing-2011-10-03T23-12-08.546Z 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 > 0, Disapprove < 1. Got: 1 Pending.

Revision history for this message
Chris Hillery (ceejatec) wrote :

I was wondering whether that was still necessary or not. I guess "not". Cool.

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/bug-fixing-2011-10-03T23-30-08.124Z/log.html

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

Validation queue job bug-fixing-2011-10-03T23-30-08.124Z is finished. The final status was:

All tests succeeded!

lp:~matthias-brantner/zorba/bug-fixing updated
10486. By Matthias Brantner

fix if Zorba is built with a different store (name of the tests contained a suffix that doesn't exist anymore) Approved: Chris Hillery

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake_modules/ZorbaModule.cmake'
2--- cmake_modules/ZorbaModule.cmake 2011-09-07 23:41:09 +0000
3+++ cmake_modules/ZorbaModule.cmake 2011-10-03 23:11:28 +0000
4@@ -544,13 +544,7 @@
5 set (willfail 1)
6 endif (willfail)
7
8- # simplestore executable doesn't need an extension
9- SET(SUFFIX)
10- IF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
11- SET(SUFFIX "_${ZORBA_STORE_NAME}")
12- ENDIF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
13-
14- set_tests_properties ("${testname}${SUFFIX}"
15+ set_tests_properties ("${testname}"
16 PROPERTIES WILL_FAIL ${willfail})
17
18 # Also store the name and bug ID of this test in our output file

Subscribers

People subscribed via source and target branches