Changeset: 66b05376a030 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=66b05376a030 Added Files: monetdb5/mal/Tests/tst300.malC monetdb5/mal/Tests/tst301.malC monetdb5/mal/Tests/tst302.malC monetdb5/mal/Tests/tst303.malC monetdb5/mal/Tests/tst304.malC monetdb5/mal/Tests/tst305.malC monetdb5/mal/Tests/tst307.malC monetdb5/mal/Tests/tst308.malC monetdb5/mal/Tests/tst400.malC monetdb5/mal/Tests/tst401.malC monetdb5/mal/Tests/tst500.malC monetdb5/mal/Tests/tst501.malC monetdb5/mal/Tests/tst560.malC Removed Files: monetdb5/mal/Tests/tst300.mal monetdb5/mal/Tests/tst301.mal monetdb5/mal/Tests/tst302.mal monetdb5/mal/Tests/tst303.mal monetdb5/mal/Tests/tst304.mal monetdb5/mal/Tests/tst305.mal monetdb5/mal/Tests/tst307.mal monetdb5/mal/Tests/tst308.mal monetdb5/mal/Tests/tst400.mal monetdb5/mal/Tests/tst401.mal monetdb5/mal/Tests/tst500.mal monetdb5/mal/Tests/tst501.mal monetdb5/mal/Tests/tst560.mal Modified Files: monetdb5/mal/Tests/tst300.stable.out monetdb5/mal/Tests/tst301.stable.out monetdb5/mal/Tests/tst302.stable.err monetdb5/mal/Tests/tst302.stable.out monetdb5/mal/Tests/tst303.stable.err monetdb5/mal/Tests/tst303.stable.out monetdb5/mal/Tests/tst304.stable.out monetdb5/mal/Tests/tst305.stable.err monetdb5/mal/Tests/tst305.stable.out monetdb5/mal/Tests/tst307.stable.out monetdb5/mal/Tests/tst308.stable.out monetdb5/mal/Tests/tst400.stable.out monetdb5/mal/Tests/tst401.stable.out monetdb5/mal/Tests/tst500.stable.out monetdb5/mal/Tests/tst501.stable.out monetdb5/mal/Tests/tst560.stable.out Branch: default Log Message:
MAL test revamping diffs (truncated from 1051 to 300 lines): diff --git a/monetdb5/mal/Tests/tst300.mal b/monetdb5/mal/Tests/tst300.malC rename from monetdb5/mal/Tests/tst300.mal rename to monetdb5/mal/Tests/tst300.malC diff --git a/monetdb5/mal/Tests/tst300.stable.out b/monetdb5/mal/Tests/tst300.stable.out --- a/monetdb5/mal/Tests/tst300.stable.out +++ b/monetdb5/mal/Tests/tst300.stable.out @@ -5,34 +5,29 @@ stdout of test 'tst300` in directory 'mo # 08:01:13 > 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 tst300.mal </dev/null # 08:01:13 > -# 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. -## Exception identifiers can be introduced at any place -# -# raise myNewException:= "new exception"; -# printf("should not come here\n"); -##exception block; -#catch myNewException; -# printf("caught exception\n"); -#exit myNewException; -#end tst; -function user.tst():void; - raise myNewException:str := "new exception"; - io.printf("should not come here\n"); -#exception block; -catch myNewException:str; - io.printf("caught exception\n"); -exit myNewException:str; -end user.tst; -function user.main():void; -# Exception identifiers can be introduced at any place - user.tst(); -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:33523/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-20953/.s.monetdb.33523 +# 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. + +# 08:50:54 > +# 08:50:54 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-20953" "--port=33523" +# 08:50:54 > + +#tst(); caught exception # 08:01:13 > diff --git a/monetdb5/mal/Tests/tst301.mal b/monetdb5/mal/Tests/tst301.malC rename from monetdb5/mal/Tests/tst301.mal rename to monetdb5/mal/Tests/tst301.malC --- a/monetdb5/mal/Tests/tst301.mal +++ b/monetdb5/mal/Tests/tst301.malC @@ -1,6 +1,8 @@ #propagate INT exception +function foo(); raise IllegalAccess := 1234; io.print("should not come here\n"); catch IllegalAccess; io.printf("caught %d\n",IllegalAccess); exit IllegalAccess; +end; diff --git a/monetdb5/mal/Tests/tst301.stable.out b/monetdb5/mal/Tests/tst301.stable.out --- a/monetdb5/mal/Tests/tst301.stable.out +++ b/monetdb5/mal/Tests/tst301.stable.out @@ -5,31 +5,32 @@ stdout of test 'tst301` in directory 'mo # 08:01:14 > 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 tst301.mal </dev/null # 08:01:14 > -# 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. -##propagate INT exception -#raise IllegalAccess := 1234; -# print("should not come here\n"); -#catch IllegalAccess; -# printf("caught %d\n",IllegalAccess); -#exit IllegalAccess; -# -function user.main():void; -#propagate INT exception - raise IllegalAccess := 1234; - io.print("should not come here\n"); -catch IllegalAccess; - io.printf("caught %d\n",IllegalAccess); -exit IllegalAccess; -end user.main; -caught 1234 +# 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:30527/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-23106/.s.monetdb.30527 +# 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 -# 08:01:14 > -# 08:01:14 > Done. -# 08:01:14 > +Ready. +# 09:11:14 > +# 09:11:14 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-23106" "--port=30527" +# 09:11:14 > + + +# 09:11:14 > +# 09:11:14 > "Done." +# 09:11:14 > + diff --git a/monetdb5/mal/Tests/tst302.mal b/monetdb5/mal/Tests/tst302.malC rename from monetdb5/mal/Tests/tst302.mal rename to monetdb5/mal/Tests/tst302.malC --- a/monetdb5/mal/Tests/tst302.mal +++ b/monetdb5/mal/Tests/tst302.malC @@ -1,4 +1,7 @@ #propagate INT exception # (you should be able to pass it upwards though) +function foo(); raise PermissionDeniedException := 1234; io.print("should not come here\n"); +end; +user.foo(); diff --git a/monetdb5/mal/Tests/tst302.stable.err b/monetdb5/mal/Tests/tst302.stable.err --- a/monetdb5/mal/Tests/tst302.stable.err +++ b/monetdb5/mal/Tests/tst302.stable.err @@ -1,1 +1,42 @@ stderr of test 'tst302` in directory 'monetdb5/mal` itself: + + +# 09:00:01 > +# 09:00:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30157" "--set" "mapi_usock=/var/tmp/mtest-21311/.s.monetdb.30157" "--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" +# 09:00:01 > + +# 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 = 30157 +# cmdline opt mapi_usock = /var/tmp/mtest-21311/.s.monetdb.30157 +# 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 + +# 09:00:01 > +# 09:00:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21311" "--port=30157" +# 09:00:01 > + +MAPI = (monetdb) /var/tmp/mtest-23106/.s.monetdb.30527 +QUERY = user.foo(); +ERROR = !MALException:user.foo[3]:Exception not caught + + + +# 09:00:01 > +# 09:00:01 > "Done." +# 09:00:01 > + diff --git a/monetdb5/mal/Tests/tst302.stable.out b/monetdb5/mal/Tests/tst302.stable.out --- a/monetdb5/mal/Tests/tst302.stable.out +++ b/monetdb5/mal/Tests/tst302.stable.out @@ -1,34 +1,36 @@ stdout of test 'tst302` in directory 'monetdb5/mal` itself: -# 08:01:15 > -# 08:01:15 > 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 tst302.mal </dev/null -# 08:01:15 > +# 09:00:01 > +# 09:00:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30157" "--set" "mapi_usock=/var/tmp/mtest-21311/.s.monetdb.30157" "--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" +# 09:00:01 > -# MonetDB Server v4.99.19 -# Copyright (c) 1993-2006 CWI, all rights reserved -# Compiled for x86_64-pc-linux-gnu/64bit with 64bit OIDs dynamically linked -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -##propagate INT exception -## (you should be able to pass it upwards though) -#raise IllegalAccess := 1234; -# print("should not come here\n"); -# -function user.main():void; -#propagate INT exception -# (you should be able to pass it upwards though) - raise PermissionDeniedException := 1234; - io.print("should not come here\n"); -end user.main; -!MALException:user.main[5]:Exception not caught +# 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:30157/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21311/.s.monetdb.30157 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.4' +# Finished reading the write-ahead log 'sql_logs/sql/log.4' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded +Ready. +# 09:00:01 > +# 09:00:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-21311" "--port=30157" +# 09:00:01 > +# 09:00:01 > +# 09:00:01 > "Done." +# 09:00:01 > - -# 17:45:29 > -# 17:45:29 > Done. -# 17:45:29 > - diff --git a/monetdb5/mal/Tests/tst303.mal b/monetdb5/mal/Tests/tst303.malC rename from monetdb5/mal/Tests/tst303.mal rename to monetdb5/mal/Tests/tst303.malC --- a/monetdb5/mal/Tests/tst303.mal +++ b/monetdb5/mal/Tests/tst303.malC @@ -1,4 +1,5 @@ # recursively raise an exception passed upward +function foo(); raise IllegalAccess := "an exception"; io.print("should not come here\n"); catch IllegalAccess; @@ -7,3 +8,5 @@ raise IllegalAccess:= "a second exceptio io.print("should not come here either\n"); exit IllegalAccess; io.print("should not be done"); +end; +user.foo(); diff --git a/monetdb5/mal/Tests/tst303.stable.err b/monetdb5/mal/Tests/tst303.stable.err --- a/monetdb5/mal/Tests/tst303.stable.err +++ b/monetdb5/mal/Tests/tst303.stable.err @@ -1,1 +1,41 @@ stderr of test 'tst303` in directory 'monetdb5/mal` itself: + + +# 09:00:01 > +# 09:00:01 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30157" "--set" "mapi_usock=/var/tmp/mtest-21311/.s.monetdb.30157" "--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" +# 09:00:01 > + +# 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 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
