← Back to team overview

zorba-coders team mailing list archive

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

 

Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba.

Requested reviews:
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/78019

fix if Zorba is built with a different store (name of the tests contained a suffix that doesn't exist anymore)
-- 
https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/78019
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2011-09-07 23:41:09 +0000
+++ cmake_modules/ZorbaModule.cmake	2011-10-03 23:11:28 +0000
@@ -544,13 +544,7 @@
     set (willfail 1)
   endif (willfail)
 
-  # simplestore executable doesn't need an extension
-  SET(SUFFIX)
-  IF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
-    SET(SUFFIX "_${ZORBA_STORE_NAME}")
-  ENDIF (NOT ${ZORBA_STORE_NAME} STREQUAL "simplestore")
-
-  set_tests_properties ("${testname}${SUFFIX}"
+  set_tests_properties ("${testname}"
     PROPERTIES WILL_FAIL ${willfail})
 
   # Also store the name and bug ID of this test in our output file


Follow ups