Changeset: 613794170cea for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=613794170cea Added Files: monetdb5/tests/suite_01/Tests/test_05.malC monetdb5/tests/suite_01/Tests/test_10.malC monetdb5/tests/suite_01/Tests/test_70.malC Removed Files: monetdb5/tests/mapi/Tests/All monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat monetdb5/tests/mapi/Tests/perl_dbi.MAL.sh monetdb5/tests/mapi/Tests/perl_dbi.stable.err monetdb5/tests/mapi/Tests/perl_dbi.stable.out monetdb5/tests/mapi/Tests/sample0.MAL.bat monetdb5/tests/mapi/Tests/sample0.MAL.sh monetdb5/tests/mapi/Tests/sample0.stable.err monetdb5/tests/mapi/Tests/sample0.stable.out monetdb5/tests/mapi/Tests/sample1.MAL.bat monetdb5/tests/mapi/Tests/sample1.MAL.sh monetdb5/tests/mapi/Tests/sample1.stable.err monetdb5/tests/mapi/Tests/sample1.stable.out monetdb5/tests/mapi/Tests/sample2.MAL.bat monetdb5/tests/mapi/Tests/sample2.MAL.sh monetdb5/tests/mapi/Tests/sample2.stable.err monetdb5/tests/mapi/Tests/sample2.stable.out monetdb5/tests/mapi/Tests/sample3.MAL.bat monetdb5/tests/mapi/Tests/sample3.MAL.sh monetdb5/tests/mapi/Tests/sample3.stable.err monetdb5/tests/mapi/Tests/sample3.stable.out monetdb5/tests/mapi/Tests/sample4.MAL.bat monetdb5/tests/mapi/Tests/sample4.MAL.sh monetdb5/tests/mapi/Tests/sample4.stable.err monetdb5/tests/mapi/Tests/sample4.stable.out monetdb5/tests/mapi/Tests/smack00.MAL.bat monetdb5/tests/mapi/Tests/smack00.MAL.sh monetdb5/tests/mapi/Tests/smack00.stable.err monetdb5/tests/mapi/Tests/smack00.stable.out monetdb5/tests/mapi/Tests/smack01.MAL.bat monetdb5/tests/mapi/Tests/smack01.MAL.sh monetdb5/tests/mapi/Tests/smack01.stable.err monetdb5/tests/mapi/Tests/smack01.stable.out monetdb5/tests/suite_01/Tests/test_05.mal monetdb5/tests/suite_01/Tests/test_10.mal monetdb5/tests/suite_01/Tests/test_15.mal monetdb5/tests/suite_01/Tests/test_15.stable.err monetdb5/tests/suite_01/Tests/test_15.stable.out monetdb5/tests/suite_01/Tests/test_70.mal monetdb5/tests/suite_06/Tests/All monetdb5/tests/suite_06/Tests/test_01.mal monetdb5/tests/suite_06/Tests/test_01.stable.err monetdb5/tests/suite_06/Tests/test_01.stable.out Modified Files: monetdb5/tests/suite_01/Tests/test_05.stable.out monetdb5/tests/suite_01/Tests/test_10.stable.out Branch: default Log Message:
MAL test revamping Remove some old stuff diffs (truncated from 2177 to 300 lines): diff --git a/monetdb5/tests/mapi/Tests/All b/monetdb5/tests/mapi/Tests/All deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/All +++ /dev/null @@ -1,8 +0,0 @@ -sample0 -sample1 -sample2 -sample3 -sample4 -smack00 -smack01 -HAVE_PERL?perl_dbi diff --git a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat b/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat +++ /dev/null @@ -1,6 +0,0 @@ -@echo off - -prompt # $t $g -echo on - -malsample.pl %MAPIPORT% %TSTDB% diff --git a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.sh b/monetdb5/tests/mapi/Tests/perl_dbi.MAL.sh deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -Mlog -x "malsample.pl $MAPIPORT $TSTDB" diff --git a/monetdb5/tests/mapi/Tests/perl_dbi.stable.err b/monetdb5/tests/mapi/Tests/perl_dbi.stable.err deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/perl_dbi.stable.err +++ /dev/null @@ -1,24 +0,0 @@ -stderr of test 'perl_dbi` in directory 'monetdb5/tests/mapi` itself: - - -# 20:58:10 > -# 20:58:10 > Mtimeout -timeout 180 mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=39249 --set xrpc_port=47893 --set monet_prompt= --trace "--dbname=mTests_src_test_mapi" --set mal_listing=0 --dbinit=" include sql;" ; echo ; echo Over.. -# 20:58:10 > - -#warning: please don't forget to set your vault key! -#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf) - -# 20:58:10 > -# 20:58:10 > Mtimeout -timeout 60 ./perl_dbi.SQL.sh perl_dbi -# 20:58:10 > - - -# 20:58:10 > -# 20:58:10 > sqlsample.pl 39249 mTests_src_test_mapi -# 20:58:10 > - - -# 20:58:10 > -# 20:58:10 > Done. -# 20:58:10 > - diff --git a/monetdb5/tests/mapi/Tests/perl_dbi.stable.out b/monetdb5/tests/mapi/Tests/perl_dbi.stable.out deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/perl_dbi.stable.out +++ /dev/null @@ -1,61 +0,0 @@ -stdout of test 'perl_dbi` in directory 'monetdb5/tests/mapi` itself: - - -# 20:24:31 > -# 20:24:31 > mserver5 "--config=/ufs/mk/monet5//Linux/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=31637 --set xrpc_port=43587 --set monet_prompt= --trace "--dbname=mTests_tests_mapi" "--dbinit=" ; echo ; echo Over.. -# 20:24:31 > - -# MonetDB server v5.7.0, based on kernel v1.25.0 -# Serving database 'mTests_tests_mapi', 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://koala.ins.cwi.nl:37941/ - -Ready. -#function user.main():void; -# clients.quit(); -#end main; - - -# 20:58:10 > -# 20:58:10 > Mtimeout -timeout 60 ./perl_dbi.SQL.sh perl_dbi -# 20:58:10 > - - -# 20:58:10 > -# 20:58:10 > sqlsample.pl 39249 mTests_src_test_mapi -# 20:58:10 > - - -Start a simple Monet MAL interaction - -data sources: dbi:monetdb: -field[0]: 2, last index: 0 -field[0]: 3, last index: 0 -ERROR REPORTED: DBD::monetdb::st execute failed: SyntaxException:parseError:( xyz 1); -SyntaxException:parseError: ^<identifier> expected at /export/scratch1/mk/default//Linux/lib64/perl5/vendor_perl/MonetDB/CLI/MapiPP.pm line 123. -bun: 0@0, one -bun: 1@0, two -bun: 2@0, three -rows: 3, fields: 2 -field[0,0]: 0@0 -field[0,1]: one -field[1,0]: 1@0 -field[1,1]: two -field[2,0]: 2@0 -field[2,1]: three -head[0]: 0@0 -head[1]: 1@0 -field[0]: 0@0 -field[1]: one -field[0]: 0@0 -field[1]: one - -Finished - -# 20:58:10 > -# 20:58:10 > Done. -# 20:58:10 > - diff --git a/monetdb5/tests/mapi/Tests/sample0.MAL.bat b/monetdb5/tests/mapi/Tests/sample0.MAL.bat deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample0.MAL.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call Mlog.bat -x sample0.exe %HOST% %MAPIPORT% mal diff --git a/monetdb5/tests/mapi/Tests/sample0.MAL.sh b/monetdb5/tests/mapi/Tests/sample0.MAL.sh deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample0.MAL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -Mlog -x sample0 $HOST $MAPIPORT mal diff --git a/monetdb5/tests/mapi/Tests/sample0.stable.err b/monetdb5/tests/mapi/Tests/sample0.stable.err deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/sample0.stable.err +++ /dev/null @@ -1,17 +0,0 @@ -stderr of test 'sample0` in directory 'monetdb5/tests/mapi` itself: - - -# 22:20:44 > -# 22:20:44 > Mtimeout -timeout 180 Mserver "--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set "monet_mod_path=/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB" --set "gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set "sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set mapi_port=49241 --set sql_port=58277 --set monet_prompt= --trace "--dbname=mTests_src_mapi_examples_C" "/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB/mapi.mil" ; echo ; echo Over.. -# 22:20:44 > - - -# 22:20:45 > -# 22:20:45 > Mtimeout -timeout 60 ./sample0.MAPI sample0 -# 22:20:45 > - - -# 22:20:46 > -# 22:20:46 > Done. -# 22:20:46 > - diff --git a/monetdb5/tests/mapi/Tests/sample0.stable.out b/monetdb5/tests/mapi/Tests/sample0.stable.out deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/sample0.stable.out +++ /dev/null @@ -1,38 +0,0 @@ -stdout of test 'sample0` in directory 'monetdb5/tests/mapi` itself: - - -# 10:21:41 > -# 10:21:41 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/ufs/sjoerd/Monet-virgin/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=33909" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_tests_mapi" "--set" "mal_listing=2" -# 10:21:41 > - -# MonetDB 5 server v11.12.0 (hg id: 2999165af85e) -# This is an unreleased version -# Serving database 'mTests_tests_mapi', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.629 GiB available main-memory. -# Copyright (c) 1993-July 2008 CWI. -# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved -# Visit http://www.monetdb.org/ for further information -# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:33909/ -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL module loaded - -Ready. - -# 10:21:41 > -# 10:21:41 > "./sample0.MAL.sh" "sample0" -# 10:21:41 > - - -# 10:21:41 > -# 10:21:41 > sample0 madrid 33909 mal -# 10:21:41 > - -John is 23 -Mary is 22 - -# 10:21:41 > -# 10:21:41 > "Done." -# 10:21:41 > - diff --git a/monetdb5/tests/mapi/Tests/sample1.MAL.bat b/monetdb5/tests/mapi/Tests/sample1.MAL.bat deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample1.MAL.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call Mlog.bat -x sample1.exe %HOST% %MAPIPORT% mal diff --git a/monetdb5/tests/mapi/Tests/sample1.MAL.sh b/monetdb5/tests/mapi/Tests/sample1.MAL.sh deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample1.MAL.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -Mlog -x sample1 $HOST $MAPIPORT mal diff --git a/monetdb5/tests/mapi/Tests/sample1.stable.err b/monetdb5/tests/mapi/Tests/sample1.stable.err deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/sample1.stable.err +++ /dev/null @@ -1,17 +0,0 @@ -stderr of test 'sample1` in directory 'monetdb5/tests/mapi` itself: - - -# 22:25:08 > -# 22:25:08 > Mtimeout -timeout 180 Mserver "--config=/var/tmp/_PREFIX_MONET_GNU_32_d__/etc/monet.conf" --debug=10 --set "monet_mod_path=/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB" --set "gdk_dbfarm=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/dbfarm" --set "sql_logdir=/var/tmp/_PREFIX_MONET_GNU_32_d__/var/MonetDB/log" --set mapi_port=42910 --set sql_port=52446 --set monet_prompt= --trace "--dbname=mTests_src_mapi_examples_C" "/var/tmp/_PREFIX_MONET_GNU_32_d__/lib/MonetDB/mapi.mil" ; echo ; echo Over.. -# 22:25:08 > - - -# 22:25:09 > -# 22:25:09 > Mtimeout -timeout 60 ./sample1.MAPI sample1 -# 22:25:09 > - - -# 22:25:10 > -# 22:25:10 > Done. -# 22:25:10 > - diff --git a/monetdb5/tests/mapi/Tests/sample1.stable.out b/monetdb5/tests/mapi/Tests/sample1.stable.out deleted file mode 100644 --- a/monetdb5/tests/mapi/Tests/sample1.stable.out +++ /dev/null @@ -1,36 +0,0 @@ -stdout of test 'sample1` in directory 'monetdb5/tests/mapi` itself: - - -# 10:35:54 > -# 10:35:54 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=37237 --set xrpc_port=46269 --set monet_prompt= --trace "--dbname=mTests_tests_mapi" --dbinit="" ; echo ; echo Over.. -# 10:35:54 > - -# MonetDB server v5.3.0, based on kernel v1.21.0 -# Serving database 'mTests_tests_mapi' -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2007 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://koala.ins.cwi.nl:37237/ - -Ready. -#function user.main():void; -# clients.quit(); -#end main; - - -# 22:25:09 > -# 22:25:09 > Mtimeout -timeout 60 ./sample1.MAPI sample1 -# 22:25:09 > - - -# 22:09:44 > -# 22:09:44 > sample1 draco 40178 mil -# 22:09:44 > - -John is 23 -Mary is 22 - -# 22:25:10 > -# 22:25:10 > Done. -# 22:25:10 > - diff --git a/monetdb5/tests/mapi/Tests/sample2.MAL.bat b/monetdb5/tests/mapi/Tests/sample2.MAL.bat deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample2.MAL.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off - -call Mlog.bat -x sample2.exe %HOST% %MAPIPORT% mal diff --git a/monetdb5/tests/mapi/Tests/sample2.MAL.sh b/monetdb5/tests/mapi/Tests/sample2.MAL.sh deleted file mode 100755 --- a/monetdb5/tests/mapi/Tests/sample2.MAL.sh +++ /dev/null @@ -1,3 +0,0 @@ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
