Changeset: 93ff0983967c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/93ff0983967c
Modified Files:
testing/CMakeLists.txt
testing/Mconvert.py.in
testing/Mtest.py.in
testing/Mz.py.in
tools/merovingian/client/Tests/All
tools/merovingian/daemon/snapshot.c
Branch: default
Log Message:
Suppress snapshot tests if no randomness available
diffs (84 lines):
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -83,6 +83,9 @@ endif(HAVE_PROJ)
if (HAVE_SHP)
set(HAVE_SHP_FALSE "#")
endif(HAVE_SHP)
+if (HAVE_GETENTROPY)
+ set(HAVE_GETENTROPY_FALSE "#")
+endif(HAVE_GETENTROPY)
if (NOT WIN32)
set(NOT_WIN32_FALSE "#")
endif()
diff --git a/testing/Mconvert.py.in b/testing/Mconvert.py.in
--- a/testing/Mconvert.py.in
+++ b/testing/Mconvert.py.in
@@ -400,6 +400,7 @@ CONDITIONALS = {
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PROJ' : "@HAVE_PROJ_FALSE@",
'HAVE_SHP' : "@HAVE_SHP_FALSE@",
+ 'HAVE_GETENTROPY' : "@HAVE_GETENTROPY_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
'NOT_ASSERT' : "@NOT_ASSERT_FALSE@",
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -383,6 +383,7 @@ CONDITIONALS = {
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PROJ' : "@HAVE_PROJ_FALSE@",
'HAVE_SHP' : "@HAVE_SHP_FALSE@",
+ 'HAVE_GETENTROPY' : "@HAVE_GETENTROPY_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
'NOT_ASSERT' : "@NOT_ASSERT_FALSE@",
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -404,6 +404,7 @@ CONDITIONALS = {
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PROJ' : "@HAVE_PROJ_FALSE@",
'HAVE_SHP' : "@HAVE_SHP_FALSE@",
+ 'HAVE_GETENTROPY' : "@HAVE_GETENTROPY_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
'NOT_WIN32' : "@NOT_WIN32_FALSE@",
'NOT_ASSERT' : "@NOT_ASSERT_FALSE@",
diff --git a/tools/merovingian/client/Tests/All
b/tools/merovingian/client/Tests/All
--- a/tools/merovingian/client/Tests/All
+++ b/tools/merovingian/client/Tests/All
@@ -1,2 +1,2 @@
NOT_WIN32?monetdb_status
-NOT_WIN32?monetdb_snapshot
+NOT_WIN32&HAVE_GETENTROPY?monetdb_snapshot
diff --git a/tools/merovingian/daemon/snapshot.c
b/tools/merovingian/daemon/snapshot.c
--- a/tools/merovingian/daemon/snapshot.c
+++ b/tools/merovingian/daemon/snapshot.c
@@ -89,7 +89,12 @@ snapshot_database_stream(char *dbname, s
}
if (stats->secret == NULL) {
- e = newErr("Cannot find secret for database '%s'", dbname);
+ e = newErr(
+ "Cannot find secret for database '%s'"
+#if !defined(HAVE_GETENTROPY)
+ ", maybe this platform is too old to support secure
secrets"
+#endif
+ , dbname);
goto bailout;
}
@@ -156,7 +161,12 @@ snapshot_database_to(char *dbname, char
}
if (stats->secret == NULL) {
- e = newErr("Cannot find secret for database '%s'", dbname);
+ e = newErr(
+ "Cannot find secret for database '%s'"
+#if !defined(HAVE_GETENTROPY)
+ ", maybe this platform is too old to support secure
secrets"
+#endif
+ , dbname);
goto bailout;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
