Changeset: 27c12ba9a302 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=27c12ba9a302 Added Files: monetdb5/mal/Tests/tst000.malC monetdb5/mal/Tests/tst001.malC monetdb5/mal/Tests/tst002.malC monetdb5/mal/Tests/tst003.malC monetdb5/mal/Tests/tst004.malC monetdb5/mal/Tests/tst006.malC monetdb5/mal/Tests/tst007.malC monetdb5/mal/Tests/tst008.malC monetdb5/mal/Tests/tst009.malC monetdb5/mal/Tests/tst010.malC monetdb5/mal/Tests/tst011.malC monetdb5/mal/Tests/tst012.malC monetdb5/mal/Tests/tst013.malC monetdb5/mal/Tests/tst014.malC monetdb5/mal/Tests/tst015.malC Removed Files: monetdb5/mal/Tests/tst000.mal monetdb5/mal/Tests/tst001.mal monetdb5/mal/Tests/tst002.mal monetdb5/mal/Tests/tst003.mal monetdb5/mal/Tests/tst004.mal monetdb5/mal/Tests/tst006.mal monetdb5/mal/Tests/tst007.mal monetdb5/mal/Tests/tst008.mal monetdb5/mal/Tests/tst009.mal monetdb5/mal/Tests/tst010.mal monetdb5/mal/Tests/tst011.mal monetdb5/mal/Tests/tst012.mal monetdb5/mal/Tests/tst013.mal monetdb5/mal/Tests/tst014.mal monetdb5/mal/Tests/tst015.mal Modified Files: monetdb5/mal/Tests/tst000.stable.out monetdb5/mal/Tests/tst001.stable.out monetdb5/mal/Tests/tst002.stable.err monetdb5/mal/Tests/tst002.stable.out monetdb5/mal/Tests/tst003.stable.err monetdb5/mal/Tests/tst003.stable.out monetdb5/mal/Tests/tst004.stable.out monetdb5/mal/Tests/tst006.stable.out monetdb5/mal/Tests/tst007.stable.err monetdb5/mal/Tests/tst007.stable.out monetdb5/mal/Tests/tst008.stable.err monetdb5/mal/Tests/tst008.stable.out monetdb5/mal/Tests/tst009.stable.out monetdb5/mal/Tests/tst010.stable.err monetdb5/mal/Tests/tst010.stable.out monetdb5/mal/Tests/tst011.stable.out monetdb5/mal/Tests/tst012.stable.out monetdb5/mal/Tests/tst013.stable.err monetdb5/mal/Tests/tst013.stable.out monetdb5/mal/Tests/tst014.stable.out monetdb5/mal/Tests/tst015.stable.out Branch: default Log Message:
Recast a few mal tests diffs (truncated from 1413 to 300 lines): diff --git a/monetdb5/mal/Tests/tst000.mal b/monetdb5/mal/Tests/tst000.malC rename from monetdb5/mal/Tests/tst000.mal rename to monetdb5/mal/Tests/tst000.malC diff --git a/monetdb5/mal/Tests/tst000.stable.out b/monetdb5/mal/Tests/tst000.stable.out --- a/monetdb5/mal/Tests/tst000.stable.out +++ b/monetdb5/mal/Tests/tst000.stable.out @@ -9,16 +9,24 @@ stdout of test 'tst000` in directory 'mo # Serving database 'mTests_src_mal', 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://eir.ins.cwi.nl:33756/ -##empty test file, used to check startup problems -# -function user.main():void; -#empty test file, used to check startup problems -end user.main; +# 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://vienna.da.cwi.nl:31270/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-9852/.s.monetdb.31270 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 10:56:51 > -# 10:56:51 > Done. -# 10:56:51 > +Ready. +# 11:01:26 > +# 11:01:26 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-9852" "--port=31270" +# 11:01:26 > + + +# 11:01:26 > +# 11:01:26 > "Done." +# 11:01:26 > + diff --git a/monetdb5/mal/Tests/tst001.mal b/monetdb5/mal/Tests/tst001.malC rename from monetdb5/mal/Tests/tst001.mal rename to monetdb5/mal/Tests/tst001.malC diff --git a/monetdb5/mal/Tests/tst001.stable.out b/monetdb5/mal/Tests/tst001.stable.out --- a/monetdb5/mal/Tests/tst001.stable.out +++ b/monetdb5/mal/Tests/tst001.stable.out @@ -5,18 +5,29 @@ stdout of test 'tst001` in directory 'mo # 07:58:32 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst001.mal </dev/null # 07:58:32 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -#printf("hello world\n"); -# -function user.main():void; - io.printf("hello world\n"); -end user.main; +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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://vienna.da.cwi.nl:32437/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23910/.s.monetdb.32437 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. + +# 22:09:35 > +# 22:09:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23910" "--port=32437" +# 22:09:35 > + +#io.printf("hello world\n"); hello world # 07:58:32 > diff --git a/monetdb5/mal/Tests/tst002.mal b/monetdb5/mal/Tests/tst002.malC rename from monetdb5/mal/Tests/tst002.mal rename to monetdb5/mal/Tests/tst002.malC diff --git a/monetdb5/mal/Tests/tst002.stable.err b/monetdb5/mal/Tests/tst002.stable.err --- a/monetdb5/mal/Tests/tst002.stable.err +++ b/monetdb5/mal/Tests/tst002.stable.err @@ -1,1 +1,45 @@ stderr of test 'tst002` in directory 'monetdb5/mal` itself: + + +# 22:10:35 > +# 22:10:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30853" "--set" "mapi_usock=/var/tmp/mtest-23963/.s.monetdb.30853" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 22:10:35 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 30853 +# cmdline opt mapi_usock = /var/tmp/mtest-23963/.s.monetdb.30853 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt mal_listing = 2 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 22:10:35 > +# 22:10:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23963" "--port=30853" +# 22:10:35 > + +MAPI = (monetdb) /var/tmp/mtest-10100/.s.monetdb.34120 +QUERY = true:= 23; +ERROR = !SyntaxException:parseError: true:= 23; + !SyntaxException:parseError:^<identifier> expected +MAPI = (monetdb) /var/tmp/mtest-10100/.s.monetdb.34120 +QUERY = false:= 24; +ERROR = !SyntaxException:parseError: false:= 24; + !SyntaxException:parseError:^<identifier> expected + +# 22:10:35 > +# 22:10:35 > "Done." +# 22:10:35 > + diff --git a/monetdb5/mal/Tests/tst002.stable.out b/monetdb5/mal/Tests/tst002.stable.out --- a/monetdb5/mal/Tests/tst002.stable.out +++ b/monetdb5/mal/Tests/tst002.stable.out @@ -5,32 +5,30 @@ stdout of test 'tst002` in directory 'mo # 07:58:32 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst002.mal </dev/null # 07:58:32 > -# MonetDB server v5.7.0, based on kernel v1.25.0 -# Serving database 'mTests_src_mal', using 4 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Copyright (c) 1993-2008 CWI, all rights reserved -# Visit http://monetdb.cwi.nl/ for further information -# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38563/ -!SyntaxException:parseError: true:= 23; -!SyntaxException:parseError:^<identifier> expected -!SyntaxException:parseError: false:= 24; -!SyntaxException:parseError:^<identifier> expected -#barrier barrier:= true; -# b:= true; -# b:= false; -#exit barrier; -# -function user.main():void; -# reserved names may not be used as target variables - ; - ; -barrier barrier := true; - b := true; - b := false; -exit barrier; -end user.main; +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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://vienna.da.cwi.nl:30853/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23963/.s.monetdb.30853 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 07:58:32 > -# 07:58:32 > Done. -# 07:58:32 > +Ready. +# 22:10:35 > +# 22:10:35 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23963" "--port=30853" +# 22:10:35 > + + +# 22:10:35 > +# 22:10:35 > "Done." +# 22:10:35 > + diff --git a/monetdb5/mal/Tests/tst003.mal b/monetdb5/mal/Tests/tst003.malC rename from monetdb5/mal/Tests/tst003.mal rename to monetdb5/mal/Tests/tst003.malC diff --git a/monetdb5/mal/Tests/tst003.stable.err b/monetdb5/mal/Tests/tst003.stable.err --- a/monetdb5/mal/Tests/tst003.stable.err +++ b/monetdb5/mal/Tests/tst003.stable.err @@ -1,1 +1,41 @@ stderr of test 'tst003` in directory 'monetdb5/mal` itself: + + +# 22:10:35 > +# 22:10:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30853" "--set" "mapi_usock=/var/tmp/mtest-23963/.s.monetdb.30853" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" "--set" "mal_listing=2" "--set" "embedded_r=yes" +# 22:10:35 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 30853 +# cmdline opt mapi_usock = /var/tmp/mtest-23963/.s.monetdb.30853 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt mal_listing = 2 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 22:10:36 > +# 22:10:36 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23963" "--port=30853" +# 22:10:36 > + +MAPI = (monetdb) /var/tmp/mtest-10100/.s.monetdb.34120 +QUERY = end foo; +ERROR = !TypeException:user.foo[1]:'b' may not be used before being initialized + !TypeException:user.foo[3]:'c' may not be used before being initialized + +# 22:10:36 > +# 22:10:36 > "Done." +# 22:10:36 > + diff --git a/monetdb5/mal/Tests/tst003.stable.out b/monetdb5/mal/Tests/tst003.stable.out --- a/monetdb5/mal/Tests/tst003.stable.out +++ b/monetdb5/mal/Tests/tst003.stable.out @@ -5,31 +5,32 @@ stdout of test 'tst003` in directory 'mo # 07:58:33 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB" --set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set sql_port=55708 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst003.mal </dev/null # 07:58:33 > -# Monet Database Server V4.99.19 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf -# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## test illegal variable use -# -#a:=b; #b not yet defined -#b:=c; #c undefined -#end foo; -!TypeException:user.foo[1]:'b' may not be used before being initialized -!TypeException:user.foo[3]:'c' may not be used before being initialized -function user.foo():void; - a := b; -#b not yet defined - b := c; -#c undefined -end user.foo; -function user.main():void; -# test illegal variable use -end user.main; +# MonetDB 5 server v11.22.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 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://vienna.da.cwi.nl:30853/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23963/.s.monetdb.30853 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.3' +# Finished reading the write-ahead log 'sql_logs/sql/log.3' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded -# 07:58:33 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
