Changeset: 50c1a2c652b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/50c1a2c652b8
Modified Files:
monetdb5/mal/mal_prelude.c
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
Merge with Jun2023 branch.
diffs (48 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1006,6 +1006,12 @@ sql_relation2stmt(backend *be, sql_rel *
}
static int
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ <= 8
+/* bug on CentOS 7 (gnuc 4.8.5) where this function gets inlined and
+ * the compiler then complains about query getting modified after the
+ * setjmp call; fix is to explicitly prevent inlining */
+__attribute__((__noinline__))
+#endif
backend_dumpstmt_body(backend *be, MalBlkPtr mb, sql_rel *r, int top, int
add_end, const char *query)
{
mvc *m = be->mvc;
diff --git a/testing/README b/testing/README
--- a/testing/README
+++ b/testing/README
@@ -8,7 +8,7 @@ http://monetdb.cwi.nl/Development/TestWe
- The testing environment consists of the following tools:
+ Mtest.py a python script to run tests
- + Mz.py another python script to run tests in a slightly different way
+ + Mz.py equivalent to running Mtest.py --no-html (legacy interface)
When called with command-line option "--help", each of these tools
provides the respective usage information.
diff --git a/testing/monetdb_mtest.bat.in b/testing/monetdb_mtest.bat.in
--- a/testing/monetdb_mtest.bat.in
+++ b/testing/monetdb_mtest.bat.in
@@ -10,4 +10,4 @@
set
PATH=@CMAKE_INSTALL_FULL_LIBDIR@;@CMAKE_INSTALL_FULL_LIBDIR@\monetdb5;@CMAKE_INSTALL_FULL_BINDIR@;%PATH%
cd "@CMAKE_HOME_DIRECTORY@"
-@CMAKE_INSTALL_FULL_BINDIR@/Mz.py.bat
+@CMAKE_INSTALL_FULL_BINDIR@/Mtest.py.bat --no-html
diff --git a/testing/monetdb_mtest.sh.in b/testing/monetdb_mtest.sh.in
--- a/testing/monetdb_mtest.sh.in
+++ b/testing/monetdb_mtest.sh.in
@@ -8,6 +8,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
cd "@CMAKE_HOME_DIRECTORY@"
-PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH @CMAKE_INSTALL_FULL_BINDIR@/Mz.py
+PATH=@CMAKE_INSTALL_FULL_BINDIR@:$PATH @CMAKE_INSTALL_FULL_BINDIR@/Mtest.py
--no-html
#exit 0
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
