Changeset: 329ea5beb440 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=329ea5beb440 Added Files: monetdb5/mal/Tests/tst016.malC monetdb5/mal/Tests/tst018.malC monetdb5/mal/Tests/tst019.malC monetdb5/mal/Tests/tst020.malC monetdb5/mal/Tests/tst021.malC monetdb5/mal/Tests/tst022.malC monetdb5/mal/Tests/tst024.malC monetdb5/mal/Tests/tst025.malC monetdb5/mal/Tests/tst026.malC monetdb5/mal/Tests/tst027.malC monetdb5/mal/Tests/tst028.malC monetdb5/mal/Tests/tst029.malC Removed Files: monetdb5/mal/Tests/tst016.mal monetdb5/mal/Tests/tst018.mal monetdb5/mal/Tests/tst019.mal monetdb5/mal/Tests/tst020.mal monetdb5/mal/Tests/tst021.mal monetdb5/mal/Tests/tst022.mal monetdb5/mal/Tests/tst024.mal monetdb5/mal/Tests/tst025.mal monetdb5/mal/Tests/tst026.mal monetdb5/mal/Tests/tst027.mal monetdb5/mal/Tests/tst028.mal monetdb5/mal/Tests/tst029.mal Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst016.stable.out monetdb5/mal/Tests/tst018.stable.out monetdb5/mal/Tests/tst019.stable.err monetdb5/mal/Tests/tst019.stable.out monetdb5/mal/Tests/tst020.stable.out monetdb5/mal/Tests/tst021.stable.out monetdb5/mal/Tests/tst024.stable.out monetdb5/mal/Tests/tst025.stable.out monetdb5/mal/Tests/tst026.stable.out monetdb5/mal/Tests/tst027.stable.err monetdb5/mal/Tests/tst027.stable.out monetdb5/mal/Tests/tst028.stable.out monetdb5/mal/Tests/tst029.stable.out Branch: default Log Message:
MAL tests revamping. diffs (truncated from 836 to 300 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -18,6 +18,7 @@ tst018 tst019 tst020 tst021 +tst022 tst024 tst025 tst026 diff --git a/monetdb5/mal/Tests/tst016.mal b/monetdb5/mal/Tests/tst016.malC rename from monetdb5/mal/Tests/tst016.mal rename to monetdb5/mal/Tests/tst016.malC diff --git a/monetdb5/mal/Tests/tst016.stable.out b/monetdb5/mal/Tests/tst016.stable.out --- a/monetdb5/mal/Tests/tst016.stable.out +++ b/monetdb5/mal/Tests/tst016.stable.out @@ -5,37 +5,35 @@ stdout of test 'tst016` in directory 'mo # 07:58:38 > 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 tst016.mal </dev/null # 07:58:38 > -# 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. -## handling basic strings -#mdb(); -#a:= "Dit is een test\n"; -#b:= blob.toblob(a); -#c:= blob.tostring(b); -# -#print(a); -#print(b); -#print(c); -# -# -# -# -function user.main():void; -# handling basic strings - a := "Dit is een test\n"; - b := blob.toblob(a); - c := blob.tostring(b); - io.print(a); - io.print(b); - io.print(c); -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:31044/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12237/.s.monetdb.31044 +# 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. + +# 11:22:45 > +# 11:22:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12237" "--port=31044" +# 11:22:45 > + +#io.print(a); [ "Dit is een test\n" ] -[ (17: 44 69 74 20 69 73 20 65 65 6E 20 74 65 73 74 0A 00) ] +#io.print(b); +[ "(17: 44 69 74 20 69 73 20 65 65 6E 20 74 65 73 74 0A 00)" ] +#io.print(c); [ "Dit is een test\n" ] # 20:08:53 > diff --git a/monetdb5/mal/Tests/tst018.mal b/monetdb5/mal/Tests/tst018.malC rename from monetdb5/mal/Tests/tst018.mal rename to monetdb5/mal/Tests/tst018.malC diff --git a/monetdb5/mal/Tests/tst018.stable.out b/monetdb5/mal/Tests/tst018.stable.out --- a/monetdb5/mal/Tests/tst018.stable.out +++ b/monetdb5/mal/Tests/tst018.stable.out @@ -5,39 +5,29 @@ stdout of test 'tst018` in directory 'mo # 15:40:15 > Mtimeout -timeout 60 Mserver "--config=/ufs/mk/monet5/src/mal/Tests/All.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/opensource/MonetDB/Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/log" --set mapi_port=48317 --set sql_port=57615 --set monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal tst018.mal </dev/null # 15:40:15 > -# Monet Database Server V4.5.0 -# Copyright (c) 1993-2004, CWI. All rights reserved. -# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked. -# config:/ufs/mk/monet5/src/mal/Tests/All.conf -# dbfarm:/ufs/mk/opensource/MonetDB/Linux/var/MonetDB5/dbfarm -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information. -## handling assignments of 'nil'; -# -#i:= 23; -#i:= nil; -#print(i); -# -#b:= new(:int,:int); -#b:= nil; -#print(b); -# -#s:= "hello"; -#s:= nil; -#print(s); -# -function user.main():void; -# handling assignments of 'nil'; - i := 23; - i := nil; - io.print(i); - b := bat.new(:oid,:int); - b := nil; - io.print(b); - s := "hello"; - s := nil; - io.print(s); -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:31044/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12237/.s.monetdb.31044 +# 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. + +# 11:22:44 > +# 11:22:44 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12237" "--port=31044" +# 11:22:44 > + +#io.print(i); [ nil ] [ nil ] [ nil ] diff --git a/monetdb5/mal/Tests/tst019.mal b/monetdb5/mal/Tests/tst019.malC rename from monetdb5/mal/Tests/tst019.mal rename to monetdb5/mal/Tests/tst019.malC diff --git a/monetdb5/mal/Tests/tst019.stable.err b/monetdb5/mal/Tests/tst019.stable.err --- a/monetdb5/mal/Tests/tst019.stable.err +++ b/monetdb5/mal/Tests/tst019.stable.err @@ -6,7 +6,46 @@ stderr of test 'tst019` in directory 'mo # 10:58:00 > -# 10:58:00 > -# 10:58:00 > Done. -# 10:58:00 > +# 11:22:44 > +# 11:22:44 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12237" "--port=31044" +# 11:22:44 > +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome; +ERROR = !TypeException:user.welcome[3]:type mismatch void := str +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome0; +ERROR = !TypeException:user.welcome0[3]:Multiple assignment mismatch +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome1; +ERROR = !ERROR: MSresetVariablescould not allocate space for +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome3; +ERROR = !SyntaxException:user.welcome3[2]:invalid return target! +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome4; +ERROR = !TypeException:user.welcome4[2]:Multiple assignment mismatch + !ERROR: MSresetVariablescould not allocate space for +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = end welcome5; +ERROR = !ERROR: MSresetVariablescould not allocate space for +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = y:= user.welcome1(1); +ERROR = !SyntaxException:user.main[0]:RETURN missing +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = io.print(y); +ERROR = !SyntaxException:user.main[0]:RETURN missing +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = y:= user.welcome2(1); +ERROR = !SyntaxException:user.main[0]:RETURN missing +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = io.print(y); +ERROR = !SyntaxException:user.main[0]:RETURN missing +MAPI = (monetdb) /var/tmp/mtest-12237/.s.monetdb.31044 +QUERY = (x,y):= user.welcome2(1); +ERROR = !TypeException:user.main[1]:'user.welcome2' undefined in: (x:any,y:any) := user.welcome2(1:int); + +# 11:22:45 > +# 11:22:45 > "Done." +# 11:22:45 > + diff --git a/monetdb5/mal/Tests/tst019.stable.out b/monetdb5/mal/Tests/tst019.stable.out --- a/monetdb5/mal/Tests/tst019.stable.out +++ b/monetdb5/mal/Tests/tst019.stable.out @@ -5,67 +5,32 @@ stdout of test 'tst019` in directory 'mo # 07:58:38 > 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 tst019.mal </dev/null # 07:58:38 > -# 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. -#function welcome(lim:int):void; -# i:= 2; -# w:="hello"; -# return w; # should produce a type error -#end welcome; -!TypeException:user.welcome[3]:type mismatch void := str -function user.welcome(lim:int):void; - i := 2; - w := "hello"; - return welcome := w; -# should produce a type error -end user.welcome; -!TypeException:user.welcome0[3]:Multiple assignment mismatch -function user.welcome0(lim:int):str; - i := 2; - w := "hello"; - return welcome0 := (w,i); -# should produce a type error -end user.welcome0; -function user.welcome1(lim:int):str; - i := 2; - return w := "hello"; -end user.welcome1; -function user.welcome2(lim:int):str; - i := 2; - w := "hello"; - return welcome2 := w; -end user.welcome2; -!SyntaxException:user.welcome3[2]:invalid return target! -function user.welcome3(lim:int) (w:str,i:int); - i := 2; - return w := "hello"; -#illegal return statement -end user.welcome3; -!TypeException:user.welcome4[2]:Multiple assignment mismatch -function user.welcome4(lim:int) (w:str,i:int); - i := 2; - return (w,i) := "hello"; -#illegal return statement -end user.welcome4; -function user.welcome5(lim:int) (X_2:str,X_3:int); - i := 2; - return (w,i) := ("hello",2); -end user.welcome5; -!TypeException:user.main[5]:'user.welcome2' undefined in: (x:any,y:str) := user.welcome2(1:int); -function user.main():void; - y := user.welcome1(1); - io.print(y); - y := user.welcome2(1); - io.print(y); - (x,y) := user.welcome2(1); -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:31044/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-12237/.s.monetdb.31044 +# 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:38 > -# 07:58:38 > Done. -# 07:58:38 > +Ready. +# 11:22:44 > +# 11:22:44 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-12237" "--port=31044" +# 11:22:44 > _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
