Changeset: b1b84aef37f5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1b84aef37f5
Modified Files:
gdk/gdk_utils.h
tools/embedded/rpackage/tests/testthat/test_lowlevel.R
Branch: embedded
Log Message:
merge fix
diffs (23 lines):
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -93,7 +93,7 @@ gdk_export int GDKexiting(void);
gdk_export const char *GDKversion(void);
-gdk_export int GDKextractParentAndLastDirFromPath(const char *path, char
*last_dir_parent, char *last_dir);
+gdk_export gdk_return GDKextractParentAndLastDirFromPath(const char *path,
char *last_dir_parent, char *last_dir);
// these are used in embedded mode to jump out of GDKfatal
gdk_export jmp_buf GDKfataljump;
diff --git a/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
b/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
--- a/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
+++ b/tools/embedded/rpackage/tests/testthat/test_lowlevel.R
@@ -2,6 +2,7 @@ library(testthat)
library(MonetDBLite)
test_that("db starts up", {
+ expect_error(monetdb_embedded_startup("/dev/null"))
expect_equal(monetdb_embedded_startup(), TRUE)
expect_warning(monetdb_embedded_startup())
})
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
