Changeset: e8f4830c7cc2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e8f4830c7cc2
Added Files:
monetdb5/tools/Tests/mserver5--help.stable.err.Windows
sql/test/Tests/bincopycollist-prepare.py
Removed Files:
sql/test/Tests/bincopycollist-prepare.bat
sql/test/Tests/bincopycollist-prepare.sh
sql/test/Tests/bincopyint.bin
Modified Files:
monetdb5/mal/mal_parser.c
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/bincopycollist-prepare.stable.err
sql/test/Tests/bincopycollist-prepare.stable.out
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (193 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -949,6 +949,15 @@ static str parseModule(Client cntxt)
return "";
}
+
+static int
+malLibraryEnabled(str name) {
+ if (strcmp(name, "pyapi") == 0) {
+ return GDKgetenv_istrue("embedded_py") ||
GDKgetenv_isyes("embedded_py");
+ }
+ return 1;
+}
+
/*
* Include statement
* An include statement is immediately taken into effect. This
@@ -995,6 +1004,10 @@ parseInclude(Client cntxt)
}
skipToEnd(cntxt);
+ if (!malLibraryEnabled(modnme)) {
+ return "";
+ }
+
s = loadLibrary(modnme, FALSE);
if (s) {
parseError(cntxt, s);
diff --git a/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
new file mode 100644
--- /dev/null
+++ b/monetdb5/tools/Tests/mserver5--help.stable.err.Windows
@@ -0,0 +1,43 @@
+stderr of test 'mserver5--help` in directory 'monetdb5/tools` itself:
+
+
+# 16:36:12 >
+# 16:36:12 > Mtimeout -timeout 300 ./mserver5--help mserver5--help
+# 16:36:12 >
+
+
+# 16:36:12 >
+# 16:36:12 > Mtimeout -timeout 60 mserver5 --config= --help
+# 16:36:12 >
+
+Usage: mserver5.exe [options] [scripts]
+ --dbpath=<directory> Specify database location
+ --dbextra=<directory> Directory for transient BATs
+ --dbinit=<stmt> Execute statement at startup
+ --config=<config_file> Use config_file to read options from
+ --daemon=yes|no Do not read commands from standard input [no]
+ --single-user Allow only one user at a time
+ --readonly Safeguard database
+ --set <option>=<value> Set configuration option
+ --help Print this list of options
+ --version Print version and compile time info
+The debug, testing & trace options:
+ --threads
+ --memory
+ --io
+ --heaps
+ --properties
+ --transactions
+ --modules
+ --algorithms
+ --performance
+ --optimizers
+ --trace
+ --forcemito
+ --recycler
+ --debug=<bitmask>
+
+# 10:03:11 >
+# 10:03:11 > Done.
+# 10:03:11 >
+
diff --git a/sql/test/BugTracker-2016/Tests/All
b/sql/test/BugTracker-2016/Tests/All
--- a/sql/test/BugTracker-2016/Tests/All
+++ b/sql/test/BugTracker-2016/Tests/All
@@ -21,7 +21,7 @@ rank_rewrite.Bug-3890
HAVE_LIBBZ2?min-max-uuid-column-wrong-results.Bug-3953
update_crash.Bug-3954
group_distinct_quantile.Bug-3927
-merge_project.Bug-3955
+HAVE_GEOM?merge_project.Bug-3955
decimal_vs_integer.Bug-3941
foreign_key.Bug-3938
invalidcolumns.Bug-3968
@@ -57,8 +57,8 @@ cast_and_floor.Bug-6071
union.Bug-6069
ifthenelse-void.Bug-6075
assert-on-table-producing-function.Bug-6076
-assert-on-push-project-up.Bug-6077
-assert-on-project.Bug-6078
+HAVE_NETCDF?assert-on-push-project-up.Bug-6077
+HAVE_SAMTOOLS?assert-on-project.Bug-6078
crash.Bug-6081
merge-table-edit.Bug-6084
dce.Bug-6114
diff --git a/sql/test/Tests/bincopycollist-prepare.bat
b/sql/test/Tests/bincopycollist-prepare.bat
deleted file mode 100755
--- a/sql/test/Tests/bincopycollist-prepare.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@prompt # $t $g
-@echo on
-
-copy "%TSTSRCDIR%\bincopyint.bin" "%TSTTRGDIR%"
diff --git a/sql/test/Tests/bincopycollist-prepare.py
b/sql/test/Tests/bincopycollist-prepare.py
new file mode 100644
--- /dev/null
+++ b/sql/test/Tests/bincopycollist-prepare.py
@@ -0,0 +1,9 @@
+import struct
+import os
+
+f = open(os.path.join(os.getenv('TSTTRGDIR'), 'bincopyint.bin'), 'wb')
+
+for i in range(10):
+ f.write(struct.pack('@i', i))
+
+f.close()
diff --git a/sql/test/Tests/bincopycollist-prepare.sh
b/sql/test/Tests/bincopycollist-prepare.sh
deleted file mode 100755
--- a/sql/test/Tests/bincopycollist-prepare.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-Mlog -x "cp $TSTSRCDIR/bincopyint.bin $TSTTRGDIR"
diff --git a/sql/test/Tests/bincopycollist-prepare.stable.err
b/sql/test/Tests/bincopycollist-prepare.stable.err
--- a/sql/test/Tests/bincopycollist-prepare.stable.err
+++ b/sql/test/Tests/bincopycollist-prepare.stable.err
@@ -1,17 +1,12 @@
stderr of test 'bincopycollist-prepare` in directory 'sql/test` itself:
-# 17:03:22 >
-# 17:03:22 > "./bincopycollist-prepare.sh" "bincopycollist-prepare"
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "/usr/bin/python2" "bincopycollist-prepare.py"
"bincopycollist-prepare"
+# 10:50:00 >
-# 17:03:22 >
-# 17:03:22 > cp /Users/myth/Programs/MonetDB/sql/test/Tests/bincopyint.bin
/Users/myth/opt/mTests/sql/test
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "Done."
+# 10:50:00 >
-
-# 17:03:22 >
-# 17:03:22 > "Done."
-# 17:03:22 >
-
diff --git a/sql/test/Tests/bincopycollist-prepare.stable.out
b/sql/test/Tests/bincopycollist-prepare.stable.out
--- a/sql/test/Tests/bincopycollist-prepare.stable.out
+++ b/sql/test/Tests/bincopycollist-prepare.stable.out
@@ -1,17 +1,12 @@
stdout of test 'bincopycollist-prepare` in directory 'sql/test` itself:
-# 17:03:22 >
-# 17:03:22 > "./bincopycollist-prepare.sh" "bincopycollist-prepare"
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "/usr/bin/python2" "bincopycollist-prepare.py"
"bincopycollist-prepare"
+# 10:50:00 >
-# 17:03:22 >
-# 17:03:22 > cp /Users/myth/Programs/MonetDB/sql/test/Tests/bincopyint.bin
/Users/myth/opt/mTests/sql/test
-# 17:03:22 >
+# 10:50:00 >
+# 10:50:00 > "Done."
+# 10:50:00 >
-
-# 17:03:22 >
-# 17:03:22 > "Done."
-# 17:03:22 >
-
diff --git a/sql/test/Tests/bincopyint.bin b/sql/test/Tests/bincopyint.bin
deleted file mode 100644
index
2c6aacdecdc212596c5e82ae940eaaa7de2f9437..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
