zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/unique-ptr-def-fix into lp:zorba.

Requested reviews:
  Till Westmann (tillw)
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/unique-ptr-def-fix/+merge/113389

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.

-- 
https://code.launchpad.net/~zorba-coders/zorba/unique-ptr-def-fix/+merge/113389
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'test/unit/CMakeLists.txt'
--- test/unit/CMakeLists.txt	2012-06-28 04:14:03 +0000
+++ test/unit/CMakeLists.txt	2012-07-04 12:10:53 +0000
@@ -144,7 +144,9 @@
 ZORBA_ADD_TEST("test/libunit/uri" LibUnitTest uri)
 EXPECTED_FAILURE(test/libunit/uri 3118348)
 ZORBA_ADD_TEST("test/libunit/json_parser" LibUnitTest json_parser)
-ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
+IF (NOT ZORBA_HAVE_UNIQUE_PTR)
+  ZORBA_ADD_TEST("test/libunit/unique_ptr" LibUnitTest unique_ptr)
+ENDIF (NOT ZORBA_HAVE_UNIQUE_PTR)
 IF (NOT ZORBA_NO_FULL_TEXT)
   ZORBA_ADD_TEST("test/libunit/stemmer" LibUnitTest stemmer)
   ZORBA_ADD_TEST("test/libunit/thesaurus" LibUnitTest thesaurus)