Changeset: 4046c635aa7e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4046c635aa7e
Added Files:
monetdb5/mal/Tests/tst611.malC
monetdb5/mal/Tests/tst620.malC
monetdb5/mal/Tests/tst660.malC
monetdb5/mal/Tests/tst661.malC
monetdb5/mal/Tests/tst662.malC
monetdb5/mal/Tests/tst670.malC
monetdb5/mal/Tests/tst700.malC
monetdb5/mal/Tests/tst710.malC
monetdb5/mal/Tests/tst750.malC
monetdb5/mal/Tests/tst755.malC
monetdb5/mal/Tests/tst760.malC
monetdb5/mal/Tests/tst770.malC
monetdb5/mal/Tests/tst780.malC
Removed Files:
monetdb5/mal/Tests/tst609.mal
monetdb5/mal/Tests/tst611.mal
monetdb5/mal/Tests/tst620.mal
monetdb5/mal/Tests/tst630.mal
monetdb5/mal/Tests/tst660.mal
monetdb5/mal/Tests/tst661.mal
monetdb5/mal/Tests/tst662.mal
monetdb5/mal/Tests/tst666.mal
monetdb5/mal/Tests/tst670.mal
monetdb5/mal/Tests/tst700.mal
monetdb5/mal/Tests/tst710.mal
monetdb5/mal/Tests/tst750.mal
monetdb5/mal/Tests/tst755.mal
monetdb5/mal/Tests/tst760.mal
monetdb5/mal/Tests/tst770.mal
monetdb5/mal/Tests/tst780.mal
Modified Files:
monetdb5/mal/Tests/tst611.stable.err
monetdb5/mal/Tests/tst611.stable.out
monetdb5/mal/Tests/tst620.stable.out
monetdb5/mal/Tests/tst660.stable.err
monetdb5/mal/Tests/tst660.stable.out
monetdb5/mal/Tests/tst661.stable.out
monetdb5/mal/Tests/tst662.stable.out
monetdb5/mal/Tests/tst670.stable.err
monetdb5/mal/Tests/tst670.stable.out
monetdb5/mal/Tests/tst700.stable.out
monetdb5/mal/Tests/tst710.stable.out
monetdb5/mal/Tests/tst750.stable.out
monetdb5/mal/Tests/tst755.stable.err
monetdb5/mal/Tests/tst755.stable.out
monetdb5/mal/Tests/tst760.stable.err
monetdb5/mal/Tests/tst760.stable.out
monetdb5/mal/Tests/tst770.stable.out
monetdb5/mal/Tests/tst780.stable.out
Branch: default
Log Message:
MAL test revamping
diffs (truncated from 984 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst609.mal b/monetdb5/mal/Tests/tst609.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst609.mal
+++ /dev/null
@@ -1,4 +0,0 @@
-# The include operation screwed up the welcome
-io.print("welcome");
-include algebra;
-io.print("done");
diff --git a/monetdb5/mal/Tests/tst611.mal b/monetdb5/mal/Tests/tst611.malC
rename from monetdb5/mal/Tests/tst611.mal
rename to monetdb5/mal/Tests/tst611.malC
--- a/monetdb5/mal/Tests/tst611.mal
+++ b/monetdb5/mal/Tests/tst611.malC
@@ -1,8 +1,10 @@
# initialization of BATs on the stack
# caused a problem when executed in interactve mode
+function foo();
RKA:= bat.new(:oid,:int,1048576);
bat.append(RKA,360:int);
io.print(RKA);
#the next one should fail
bat.setWriteMode(RKB);
+end foo;
diff --git a/monetdb5/mal/Tests/tst611.stable.err
b/monetdb5/mal/Tests/tst611.stable.err
--- a/monetdb5/mal/Tests/tst611.stable.err
+++ b/monetdb5/mal/Tests/tst611.stable.err
@@ -1,1 +1,40 @@
stderr of test 'tst611` in directory 'monetdb5/mal` itself:
+
+
+# 09:29:46 >
+# 09:29:46 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=39422" "--set"
"mapi_usock=/var/tmp/mtest-25470/.s.monetdb.39422" "--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:29:46 >
+
+# 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 = 39422
+# cmdline opt mapi_usock = /var/tmp/mtest-25470/.s.monetdb.39422
+# 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:29:46 >
+# 09:29:46 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25470" "--port=39422"
+# 09:29:46 >
+
+MAPI = (monetdb) /var/tmp/mtest-25470/.s.monetdb.39422
+QUERY = end foo;
+ERROR = !TypeException:user.foo[5]:'bat.setWriteMode' undefined in:
bat.setWriteMode(RKB:any);
+
+# 09:29:46 >
+# 09:29:46 > "Done."
+# 09:29:46 >
+
diff --git a/monetdb5/mal/Tests/tst611.stable.out
b/monetdb5/mal/Tests/tst611.stable.out
--- a/monetdb5/mal/Tests/tst611.stable.out
+++ b/monetdb5/mal/Tests/tst611.stable.out
@@ -17,18 +17,16 @@ stdout of test 'tst611` in directory 'mo
# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12850/.s.monetdb.31390
# MonetDB/GIS module loaded
# MonetDB/SQL module loaded
-!TypeException:user.main[7]:'bat.setWriteMode' undefined in:
bat.setWriteMode(RKB:any);
-function user.main():void;
-# initialization of BATs on the stack
-# caused a problem when executed in interactve mode
- RKA := bat.new(:oid,:int,1048576);
- bat.append(RKA,360:int);
- io.print(RKA);
-#the next one should fail
- bat.setWriteMode(RKB);
-end user.main;
+# MonetDB/R module loaded
-# 08:01:26 >
-# 08:01:26 > Done.
-# 08:01:26 >
+Ready.
+# 09:29:46 >
+# 09:29:46 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25470" "--port=39422"
+# 09:29:46 >
+
+
+# 09:29:46 >
+# 09:29:46 > "Done."
+# 09:29:46 >
+
diff --git a/monetdb5/mal/Tests/tst620.mal b/monetdb5/mal/Tests/tst620.malC
rename from monetdb5/mal/Tests/tst620.mal
rename to monetdb5/mal/Tests/tst620.malC
diff --git a/monetdb5/mal/Tests/tst620.stable.out
b/monetdb5/mal/Tests/tst620.stable.out
--- a/monetdb5/mal/Tests/tst620.stable.out
+++ b/monetdb5/mal/Tests/tst620.stable.out
@@ -5,32 +5,36 @@ stdout of test 'tst620` in directory 'mo
# 21:04:56 > 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=33678 --set sql_port=45734 --set xquery_port=51153 --set
monet_prompt= --trace "--config=/ufs/mk/monet5/src/mal/Tests/All.conf"
--dbname=mTests_src_mal tst620.mal < /dev/null
# 21:04:56 >
-# Monet Database Server V4.99.19
-# Copyright (c) 1993-2005, CWI. All rights reserved.
-# Compiled for x86_64-redhat-linux-gnu/64bit with 32bit OIDs; 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.
-##check the storage size
-#function tst():void;
-# z:= inspect.getSize();
-# io.printf("#size %d\n",z);
-#end tst;
-function user.tst():void;
- z := inspect.getSize();
- io.printf("#size %d\n",z);
-end user.tst;
-function user.main():void;
-#check the storage size
- user.tst();
- l := inspect.getSize();
- io.printf("#size %d\n",l);
-end user.main;
-#size 820
-#size 1228
+# 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:35105/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-25070/.s.monetdb.35105
+# 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
-# 21:04:56 >
-# 21:04:56 > Done.
-# 21:04:56 >
+Ready.
+# 09:24:48 >
+# 09:24:48 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25070" "--port=35105"
+# 09:24:48 >
+
+#user.tst();
+#size 948
+#io.printf("#size %d\n",l);
+#size 608
+
+# 09:24:48 >
+# 09:24:48 > "Done."
+# 09:24:48 >
+
diff --git a/monetdb5/mal/Tests/tst630.mal b/monetdb5/mal/Tests/tst630.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst630.mal
+++ /dev/null
@@ -1,42 +0,0 @@
-function fcn(i1:int, i2:int, i3:int, i4:int):void;
- io.print(i1);
- io.print(i2);
- io.print(i3);
- io.print(i4);
-end fcn;
-fcn(1,2,3,4);
-
-function fcn(i1:int, i2:int, i3:int, i4:int, i5:int, i6:int):void;
- io.print(i1);
- io.print(i2);
- io.print(i3);
- io.print(i4);
- io.print(i5);
- io.print(i6);
-end fcn;
-fcn(1,2,3,4,5,6);
-
-function fcn(i1:int, i2:int, i3:int, i4:int, i5:int, i6:int,i7:int,
i8:int):void;
- io.print(i1);
- io.print(i2);
- io.print(i3);
- io.print(i4);
- io.print(i5);
- io.print(i6);
- io.print(i7);
- io.print(i8);
-end fcn;
-fcn(1,2,3,4,5,6,7,8);
-
-function
zdeep(node:int,fcn:str,A0:str,A1:str,A2:int,A3:bte,A4:bte,A5:bte,A6:bte,A7:int):lng;
-io.print(A6);
-io.print(A7);
-return zdeep:= 1:lng;
-end zdeep;
-function
z(node:int,fcn:str,A0:str,A1:str,A2:int,A3:bte,A4:bte,A5:bte,A6:bte,A7:int):lng;
-io.print(A6);
-io.print(A7);
-zdeep(0,"fcn","1994-01-01","1994-01-01",12,6:bte,1:bte,6:bte,1:bte,24);
-return z:= 1:lng;
-end z;
-z(0,"fcn","1994-01-01","1994-01-01",12,6:bte,1:bte,6:bte,1:bte,24);
diff --git a/monetdb5/mal/Tests/tst660.mal b/monetdb5/mal/Tests/tst660.malC
rename from monetdb5/mal/Tests/tst660.mal
rename to monetdb5/mal/Tests/tst660.malC
--- a/monetdb5/mal/Tests/tst660.mal
+++ b/monetdb5/mal/Tests/tst660.malC
@@ -1,9 +1,7 @@
#Testing variable argument lists
-pattern fi(i:int...)
-address MDBdummy;
-pattern fs(i:int,s:str...)
-address MDBdummy;
+pattern fi(i:int...) address MDBdummy;
+pattern fs(i:int,s:str...) address MDBdummy;
fi(1);
fi(1,2);
diff --git a/monetdb5/mal/Tests/tst660.stable.err
b/monetdb5/mal/Tests/tst660.stable.err
--- a/monetdb5/mal/Tests/tst660.stable.err
+++ b/monetdb5/mal/Tests/tst660.stable.err
@@ -8,7 +8,30 @@ stderr of test 'tst660` in directory 'mo
#warning: please don't forget to set your vault key!
#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
-# 23:13:31 >
-# 23:13:31 > Done.
-# 23:13:31 >
+# 10:30:20 >
+# 10:30:20 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32486" "--port=30121"
+# 10:30:20 >
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fi(1);
+ERROR = !MALException:mdb.dummy:operation failed
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fi(1,2);
+ERROR = !MALException:mdb.dummy:operation failed
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fi(1,2,3);
+ERROR = !MALException:mdb.dummy:operation failed
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fs(1,"a");
+ERROR = !MALException:mdb.dummy:operation failed
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fs(1,"a","b");
+ERROR = !MALException:mdb.dummy:operation failed
+MAPI = (monetdb) /var/tmp/mtest-32486/.s.monetdb.30121
+QUERY = fs(1,"a","b","c");
+ERROR = !MALException:mdb.dummy:operation failed
+
+# 10:30:20 >
+# 10:30:20 > "Done."
+# 10:30:20 >
+
diff --git a/monetdb5/mal/Tests/tst660.stable.out
b/monetdb5/mal/Tests/tst660.stable.out
--- a/monetdb5/mal/Tests/tst660.stable.out
+++ b/monetdb5/mal/Tests/tst660.stable.out
@@ -5,37 +5,25 @@ stdout of test 'tst660` in directory 'mo
# 23:13:31 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --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
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=33778 --set xrpc_port=45490 --set monet_prompt= --trace
--dbname=mTests_src_mal tst660.mal
# 23:13:31 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-##Testing variable argument lists
-#
-#pattern fi(i:int...)
-pattern user.fi(i:int...):void address MDBdummy;
-#pattern fs(i:int,s:str...)
-pattern user.fs(i:int,s:str...):void address MDBdummy;
-#
-#fi(1);
-#fi(1,2);
-#fi(1,2,3);
-#
-#fs(1,"a");
-#fs(1,"a","b");
-#fs(1,"a","b","c");
-#
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
