MonetDB: default - removed nolonger existing embeddedTargets

[Niels Nes]

Changeset: 9f1213309682 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f1213309682
Modified Files:
        Config.cmake.in
        ctest/tools/monetdbe/cmocka_test.c
Branch: default
Log Message:

removed nolonger existing embeddedTargets
update cmocka-test


diffs (38 lines):

diff --git a/Config.cmake.in b/Config.cmake.in
--- a/Config.cmake.in
+++ b/Config.cmake.in
@@ -16,4 +16,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/gdkTa
 include("${CMAKE_CURRENT_LIST_DIR}/monetdb5Targets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/sqlTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/monetdbeTargets.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/embeddedTargets.cmake")
diff --git a/ctest/tools/monetdbe/cmocka_test.c 
b/ctest/tools/monetdbe/cmocka_test.c
--- a/ctest/tools/monetdbe/cmocka_test.c
+++ b/ctest/tools/monetdbe/cmocka_test.c
@@ -17,22 +17,19 @@
 #define error(msg) {fprintf(stderr, "Failure: %s\n", msg); return -1;}
 
 static int setup(void **state) {
-       char* err = NULL;
        monetdbe_database mdbe = NULL;
-       if ((err = monetdbe_open(&mdbe, NULL, NULL)) != NULL)
-               error(err)
+       if (monetdbe_open(&mdbe, NULL, NULL))
+               error("Failed to open database")
 
        *state = mdbe;
      return 0;
 }
 
 static int teardown(void **state) {
-       char* err = NULL;
-
        monetdbe_database mdbe = *state;
 
-       if ((err = monetdbe_close(mdbe)) != NULL)
-               error(err)
+       if (monetdbe_close(mdbe))
+               error("Failed to close database")
      return 0;
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list