Changeset: c7decd657aa5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7decd657aa5
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (truncated from 345 to 300 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -77,8 +77,8 @@ def main():
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
[r'bin\mapi.dll', # r'lib\mapi.pdb',
- r'bin\MonetODBC.dll', # r'lib\MonetODBC.pdb',
- r'bin\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
+ r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb',
+ r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
r'bin\stream.dll', # r'lib\stream.pdb',
vcpkg.format(r'bin\libiconv.dll'),
vcpkg.format(r'bin\bz2.dll'),
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBC
- SHARED)
+ MODULE)
target_sources(MonetODBC
PRIVATE
@@ -114,7 +114,7 @@ target_include_directories(MonetODBC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
target_compile_definitions(MonetODBC
- PRIVATE
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBC
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -7,11 +7,11 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
- drvcfg.c
+ drvcfg.c
drvcfg.h)
target_include_directories(MonetODBCs
@@ -21,8 +21,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -7,7 +7,7 @@
#]]
add_library(MonetODBCs
- SHARED)
+ MODULE)
target_sources(MonetODBCs
PRIVATE
@@ -23,8 +23,8 @@ target_include_directories(MonetODBCs
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
-target_compile_definitions(MonetODBCs
- PRIVATE
+target_compile_definitions(MonetODBCs
+ PRIVATE
LIBMONETODBCS)
target_link_libraries(MonetODBCs
diff --git a/sql/test/BugTracker-2009/Tests/All
b/sql/test/BugTracker-2009/Tests/All
--- a/sql/test/BugTracker-2009/Tests/All
+++ b/sql/test/BugTracker-2009/Tests/All
@@ -25,7 +25,6 @@ bool-str-bug
rollback_bug
update-crash
correlated-selection-bug
-NOT_WIN32?segfault_when_quitting_debugger.SF-2538837
row_number_bug.SF-2546109
#set_history_and_drop_table.SF-2607045 not relevant anymore
TypeException_having_count_distinct.SF-2494227
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-set optimizer = 'sequential_pipe'; -- to get predictable errors
-
-debug select * from tables;
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.err
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.err
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.err
+++ /dev/null
@@ -1,87 +0,0 @@
-stderr of test 'segfault_when_quitting_debugger.SF-2538837` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 12:13:20 >
-# 12:13:20 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=t
rue --set mapi_port=36460 --set xrpc_port=43926 --set
xrpc_docroot=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Stable/source/sql
--set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 12:13:20 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.28.0
-# builtin opt monet_pid = 10563
-# builtin opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = tst
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
-# builtin opt gdk_debug = 8
-# builtin opt gdk_mem_bigsize = 262144
-# builtin opt gdk_alloc_map = yes
-# builtin opt gdk_mem_pagebits = 14
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path =
${exec_prefix}/lib64/MonetDB:${exec_prefix}/lib64/bin
-# builtin opt monet_daemon = yes
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_noheaders = no
-# builtin opt mapi_debug = 0
-# builtin opt mapi_clients = 2
-# builtin opt sql_debug = 0
-# builtin opt sql_logdir = ${prefix}/var/MonetDB
-# builtin opt xquery_logdir = ${prefix}/var/MonetDB
-# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt gdk_dbname = demo
-# config opt gdk_alloc_map = no
-# config opt gdk_embedded = no
-# config opt gdk_debug = 0
-# config opt monet_mod_path =
${exec_prefix}/lib64/MonetDB5:${exec_prefix}/lib64/MonetDB5/lib:${exec_prefix}/lib64/MonetDB5/bin
-# config opt monet_daemon = no
-# config opt monet_welcome = yes
-# config opt mero_msglog = ${prefix}/var/log/merovingian.log
-# config opt mero_errlog = ${prefix}/var/log/merovingian.log
-# config opt mero_timeinterval = 600
-# config opt mero_pidfile = ${prefix}/var/run/merovingian.pid
-# config opt mero_exittimeout = 7
-# config opt mero_doproxy = yes
-# config opt mero_discoveryttl = 600
-# config opt mal_init = ${exec_prefix}/lib64/MonetDB5/mal_init.mal
-# config opt mal_listing = 2
-# config opt checkpoint_dir = ${prefix}/var/MonetDB5/chkpnt
-# config opt mapi_port = 50000
-# config opt mapi_open = false
-# config opt sql_logdir = ${prefix}/var/MonetDB5/sql_logs
-# config opt sql_init = ${exec_prefix}/lib64/MonetDB5/sql_init.sql
-# cmdline opt config =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/bin
-# cmdline opt gdk_dbfarm =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/dbfarm
-# cmdline opt sql_logdir =
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/sql_logs
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 36460
-# cmdline opt xrpc_port = 43926
-# cmdline opt xrpc_docroot =
/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Stable/source/sql
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
-# cmdline opt mal_listing = 0
-# cmdline opt gdk_debug = 10
-#warning: please don't forget to set your vault key!
-#(see
/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/etc/monetdb5.conf)
-
-# 12:13:20 >
-# 12:13:20 > mclient -lsql -umonetdb -Pmonetdb --host=rig --port=36460
-# 12:13:20 >
-
-
-# 12:13:21 >
-# 12:13:21 > Done.
-# 12:13:21 >
-
diff --git
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
b/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
deleted file mode 100644
---
a/sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
+++ /dev/null
@@ -1,25 +0,0 @@
-stdout of test 'segfault_when_quitting_debugger.SF-2538837` in directory
'sql/test/BugTracker-2009` itself:
-
-
-# 12:13:20 >
-# 12:13:20 > mserver5
"--config=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/lib:/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/lib64/MonetDB5/bin"
--set
"gdk_dbfarm=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/dbfarm"
--set
"sql_logdir=/ufs/manegold/_/scratch0/Monet/Testing/Stable/prefix.--enable-strict_--disable-debug_--enable-optimize_--enable-assert/var/MonetDB5/sql_logs"
--set mapi_open=true --set xrpc_open=t
rue --set mapi_port=36460 --set xrpc_port=43926 --set
xrpc_docroot=/net/rig.ins.cwi.nl/export/scratch0/manegold/Monet/Testing/Stable/source/sql
--set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker-2009" --set
mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over..
-# 12:13:20 >
-
-# MonetDB server v5.10.0, based on kernel v1.28.0
-# Serving database 'mTests_src_test_BugTracker-2009', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008- MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://rig.ins.cwi.nl:36460/
-# MonetDB/SQL module v2.28.0 loaded
-
-
-#set optimizer = 'sequential_pipe'; -- to get predictable errors
-#debug select * from tables;
-mdb>#X_1=0@0:void := querylog.define("debug select * from tables;",
"sequential_pipe", 154:int);
-
-# 22:21:12 >
-# 22:21:12 > "Done."
-# 22:21:12 >
-
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -681,7 +681,7 @@ def try_open(path, mode) :
return f
### try_open(path, mode) #
-def CreateHtmlIndex (env, *body) :
+def CreateHtmlIndex (env, ssout, sserr, *body) :
TSTDIR=env['TSTDIR']
TSTTRGDIR=env['TSTTRGDIR']
@@ -702,9 +702,17 @@ def CreateHtmlIndex (env, *body) :
'target': '%s_%s_body' % (DISTVER, TSTDIR),
'class': 'black'},
header)
- tr = Element('tr', {'valign': 'top'},
- Element('th', {'class': 'header'},
- header))
+ th = Element('th', {'class': 'header'}, header)
+ if os.path.exists('SingleServer.out.html'):
+ th.addchild(Element('br'))
+ th.addchildren(AddHref('SingleServer.out.html',
+ '%s_%s_body' % (DISTVER, TSTDIR),
+ 'out', ssout))
+ th.addchild(Text(' | '))
+ th.addchildren(AddHref('SingleServer.err.html',
+ '%s_%s_body' % (DISTVER, TSTDIR),
+ 'err', sserr))
+ tr = Element('tr', {'valign': 'top'}, th)
tr.addchildren(body)
hbody = Element('body',
{'bgcolor': white,
@@ -778,7 +786,7 @@ def CreateHtmlIndex (env, *body) :
f.close()
env['_%s_BODY_' % TSTDIR] = ["", 0]
os.chdir(BACK)
-### CreateHtmlIndex (env, *body) #
+### CreateHtmlIndex (env, ssout, sserr, *body) #
bugre = re.compile(r'\.(sf|bug)-(?P<bugno>[1-9]\d+)', re.I)
@@ -1202,6 +1210,8 @@ def PerformDir(env, testdir, testlist, B
elem = None
FdOut = F_SKIP
FdErr = F_SKIP
+ ssout = F_SKIP
+ sserr = F_SKIP
if testdir == TSTSRCBASE:
TSTDIR = os.curdir
else:
@@ -1405,6 +1415,28 @@ def PerformDir(env, testdir, testlist, B
if pSrvr is not None:
pSrvr.terminate()
pSrvr = None
+ o = open(os.path.join(TSTTRGDIR, 'SingleServer.out.html'), 'w')
+ o.write('<html><head><title>{} standard output</title></head>'
+ '<body><pre>\n'.format(TSTDIR))
+ e = F_OK
+ for line in open(os.path.join(TSTTRGDIR, 'SingleServer.out')):
+ if line != '\n' and not line.startswith('#'):
+ e = F_ERROR
+ ssout = F_ERROR
+ o.write(line.replace('&', '&').replace('<',
'<').replace('>', '>'))
+ o.write('</pre></body></html>\n')
+ o.close()
+ o = open(os.path.join(TSTTRGDIR, 'SingleServer.err.html'), 'w')
+ o.write('<html><head><title>{} standard error</title></head>'
+ '<body><pre>\n'.format(TSTDIR))
+ e = F_OK
+ for line in open(os.path.join(TSTTRGDIR, 'SingleServer.err')):
+ if line != '\n' and not line.startswith('#'):
+ e = F_ERROR
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
