Changeset: a9bb5a5eb9a2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9bb5a5eb9a2
Modified Files:
sql/backends/monet5/Tests/All
testing/Mtest.py.in
Branch: default
Log Message:
Enable HAVE_LIBSCIPY condition in Mtest, and make sure embedded_py is set.
diffs (32 lines):
diff --git a/sql/backends/monet5/Tests/All b/sql/backends/monet5/Tests/All
--- a/sql/backends/monet5/Tests/All
+++ b/sql/backends/monet5/Tests/All
@@ -27,7 +27,7 @@ HAVE_LIBPY?pyapi01
HAVE_LIBPY?pyapi02
HAVE_LIBPY?pyapi03
HAVE_LIBPY?pyapi04
-HAVE_LIBSCIPY?pyapi05
+HAVE_LIBPY&HAVE_LIBSCIPY?pyapi05
HAVE_LIBPY?pyapi06
HAVE_LIBPY?pyapi07
HAVE_LIBPY?pyapi08
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -314,6 +314,7 @@ CONDITIONALS = {
'HAVE_LIBR' : "@HAVE_LIBR_FALSE@",
'HAVE_LIBPANDAS' : "@HAVE_LIBPANDAS_FALSE@",
'HAVE_LIBPY' : "@HAVE_LIBPY_FALSE@",
+ 'HAVE_LIBSCIPY' : "@HAVE_LIBSCIPY_FALSE@",
'HAVE_LIBXML' : "@HAVE_LIBXML_FALSE@",
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_LIDAR' : "@HAVE_LIDAR_FALSE@",
@@ -2781,7 +2782,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
# enable Python integration in server
if (not all_tests or (COND != None and "HAVE_LIBPY" in COND)) and
CONDITIONALS['HAVE_LIBPY']:
Srvr.extend(['--set', 'embedded_py=true'])
-
+
pSrvr, pSrvrTimer = LaunchIt(Srvr,
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT)
ln="dummy"
while 0 < len(ln) and not ln.startswith('Ready.'):
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
