Zorba

Merge lp:~zorba-coders/zorba/unique-ptr-def-fix into lp:zorba

  1. unique-ptr-def-fix
  2. Merge into trunk
Proposed by Ghislain Fourny
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 10912
Merged at revision: 10913
Proposed branch: lp:~zorba-coders/zorba/unique-ptr-def-fix
Merge into: lp:zorba
Diff against target: 14 lines (+3/-1)
1 file modified
test/unit/CMakeLists.txt (+3/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/unique-ptr-def-fix
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Till Westmann Approve
Review via email: mp+113389@code.launchpad.net

Commit message

Adding a NOT ZORBA_HAVE_UNIQUE_PTR guard for adding the unique_ptr test, for consistency. There are guards for including the corresponding resources, so that the test was failing by lack of them.

Description of the change

Adding a NOT ZORBA_HAVE_UNIQUE_PTR guard for adding the unique_ptr test, for consistency. There are guards for including the corresponding resources, so that the test was failing by lack of them.

To post a comment you must log in.
Revision history for this message
Till Westmann (tillw) :
review: Approve
Revision history for this message
Markos Zaharioudakis (markos-za) :
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/unique-ptr-def-fix-2012-07-04T17-07-04.503Z/log.html

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

Validation queue job unique-ptr-def-fix-2012-07-04T17-07-04.503Z 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 'test/unit/CMakeLists.txt'
2--- test/unit/CMakeLists.txt 2012-06-28 04:14:03 +0000
3+++ test/unit/CMakeLists.txt 2012-07-04 12:13:21 +0000
4@@ -144,7 +144,9 @@
5 ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)
6 EXPECTED_FAILURE(test/libunit/uri 3118348)
7 ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)
8-ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
9+IF (NOT ZORBA_HAVE_UNIQUE_PTR)
10+ ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
11+ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
12 IF (NOT ZORBA_NO_FULL_TEXT)
13 ZORBA_ADD_TEST("test/libunit/stemmer" LibUnitTest stemmer)
14 ZORBA_ADD_TEST("test/libunit/thesaurus" LibUnitTest thesaurus)

Subscribers

People subscribed via source and target branches