Changeset: 8648c37526ef for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8648c37526ef
Added Files:
monetdb5/mal/Tests/tst005.malC
monetdb5/mal/Tests/tst005.stable.err
monetdb5/mal/Tests/tst022.stable.err
monetdb5/mal/Tests/tst022.stable.out
monetdb5/mal/Tests/tst116.malC
monetdb5/mal/Tests/tst116.stable.err
monetdb5/mal/Tests/tst116.stable.out
monetdb5/mal/Tests/tst237.malC
monetdb5/mal/Tests/tst237.stable.err
monetdb5/mal/Tests/tst237.stable.out
Removed Files:
monetdb5/mal/Tests/tst040.mal
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst005.stable.out
Branch: default
Log Message:
Approve output
diffs (truncated from 579 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
@@ -3,6 +3,7 @@ tst001
tst002
tst003
tst004
+tst005
tst006
tst007
tst008
@@ -35,7 +36,6 @@ tst036
tst037
tst038
tst039
-tst040
tst041
tst042
tst043
@@ -80,6 +80,7 @@ tst108
tst109
tst110
tst115
+tst116
tst1150
#tst120 files are not located in module and paths are runtime dependent
tst1200
@@ -114,6 +115,7 @@ tst232
tst233
tst234
tst235
+tst237
tst250
tst2500
tst2501
diff --git a/monetdb5/mal/Tests/tst005.malC b/monetdb5/mal/Tests/tst005.malC
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.malC
@@ -0,0 +1,23 @@
+# test proper exists
+function foo();
+ i:= 1;
+ j:= 2;
+barrier v:=i;
+ io.print("entered");
+ io.print(v);
+ redo v:= iterator.next(-1,0);
+exit v;
+ io.print("doubles");
+ i:= 1;
+barrier (v,w):=(i,j);
+ io.print("entered2");
+ io.print(v);
+ v:= v-1;
+ barrier b:= v == 0;
+ leave (v,w);
+ exit b;
+ redo (v,w):= (v,w);
+exit (v,w);
+ io.print("finished");
+end foo;
+user.foo();
diff --git a/monetdb5/mal/Tests/tst005.stable.err
b/monetdb5/mal/Tests/tst005.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst005.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'tst005` in directory 'monetdb5/mal` itself:
+
+
+# 08:15:16 >
+# 08:15:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32746" "--set"
"mapi_usock=/var/tmp/mtest-26338/.s.monetdb.32746" "--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"
+# 08:15:16 >
+
+# 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 = 32746
+# cmdline opt mapi_usock = /var/tmp/mtest-26338/.s.monetdb.32746
+# 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
+
+# 08:15:16 >
+# 08:15:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-26338" "--port=32746"
+# 08:15:16 >
+
+
+# 08:15:16 >
+# 08:15:16 > "Done."
+# 08:15:16 >
+
diff --git a/monetdb5/mal/Tests/tst005.stable.out
b/monetdb5/mal/Tests/tst005.stable.out
--- a/monetdb5/mal/Tests/tst005.stable.out
+++ b/monetdb5/mal/Tests/tst005.stable.out
@@ -1,52 +1,37 @@
-# 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/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:demo
-# Visit http://monetdb.cwi.nl for further information.
-## test proper exists
-# i:= 1;
-# j:= 2;
-#barrier v:=i;
-# print("entered");
-# print(v);
-# redo v:= v -1;
-#exit v;
-# print("doubles");
-#barrier (v,w):=(i,j);
-# print("entered");
-# print(v);
-# v:= v-1;
-# redo (v,w):= (v,w);
-#exit (v,w);
-#
-# print("finished");
-#
-function Admin.main():int; # 0 (main:int)
- i := 1; # 1 (i:int)<-($2:int)
- j := 2; # 2 (j:int)<-($4:int)
-barrier v := i; # 3 (v:int)<-(i:int) jump 7
- io.print("entered"); # 4 IOprint_val ($6:int)<-($7:str)
- io.print(v); # 5 IOprint_val ($8:int)<-(v:int)
- redo v := calc.-(v,1); # 6 CALCbinarySUBintint
(v:int)<-(v:int)($2:int) jump 4
-exit v; # 7 (v:int)
- io.print("doubles"); # 8 IOprint_val ($9:int)<-($10:str)
-barrier (v,w):= (i,j); # 9 (v:int)(w:int)<-(i:int)(j:int) jump 14
- io.print("entered"); # 10 IOprint_val ($12:int)<-($7:str)
- io.print(v); # 11 IOprint_val ($13:int)<-(v:int)
- v := calc.-(v,1); # 12 CALCbinarySUBintint (v:int)<-(v:int)($2:int)
- redo (v,w):= (v,w); # 13 (v:int)(w:int)<-(v:int)(w:int) jump 10
-exit (v,w); # 14 (v:int)(w:int)
- io.print("finished"); # 15 IOprint_val ($14:int)<-($15:str)
-end main; # 16
+stdout of test 'tst005` in directory 'monetdb5/mal` itself:
+
+
+# 08:15:16 >
+# 08:15:16 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=32746" "--set"
"mapi_usock=/var/tmp/mtest-26338/.s.monetdb.32746" "--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"
+# 08:15:16 >
+
+# 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:32746/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-26338/.s.monetdb.32746
+# 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.
+
+# 08:15:16 >
+# 08:15:16 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-26338" "--port=32746"
+# 08:15:16 >
+
[ "entered" ]
[ 1 ]
-[ "entered" ]
-[ 0 ]
[ "doubles" ]
-[ "entered" ]
+[ "entered2" ]
[ 1 ]
-[ "entered" ]
-[ 0 ]
[ "finished" ]
diff --git a/monetdb5/mal/Tests/tst022.stable.err
b/monetdb5/mal/Tests/tst022.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst022.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'tst022` in directory 'monetdb5/mal` itself:
+
+
+# 11:26:55 >
+# 11:26:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35327" "--set"
"mapi_usock=/var/tmp/mtest-12804/.s.monetdb.35327" "--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"
+# 11:26:55 >
+
+# 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 = 35327
+# cmdline opt mapi_usock = /var/tmp/mtest-12804/.s.monetdb.35327
+# 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
+
+# 11:26:56 >
+# 11:26:56 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12804" "--port=35327"
+# 11:26:56 >
+
+
+# 11:26:56 >
+# 11:26:56 > "Done."
+# 11:26:56 >
+
diff --git a/monetdb5/mal/Tests/tst022.stable.out
b/monetdb5/mal/Tests/tst022.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/mal/Tests/tst022.stable.out
@@ -0,0 +1,36 @@
+stdout of test 'tst022` in directory 'monetdb5/mal` itself:
+
+
+# 11:26:55 >
+# 11:26:55 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35327" "--set"
"mapi_usock=/var/tmp/mtest-12804/.s.monetdb.35327" "--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"
+# 11:26:55 >
+
+# 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:35327/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-12804/.s.monetdb.35327
+# 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:26:56 >
+# 11:26:56 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-12804" "--port=35327"
+# 11:26:56 >
+
+#exit b;
+ok entered first
+
+# 11:26:56 >
+# 11:26:56 > "Done."
+# 11:26:56 >
+
diff --git a/monetdb5/mal/Tests/tst040.mal b/monetdb5/mal/Tests/tst040.mal
deleted file mode 100644
--- a/monetdb5/mal/Tests/tst040.mal
+++ /dev/null
@@ -1,17 +0,0 @@
-# Variables names may be identical to type names, but
-# then they also have to bear the same value
-
-str := "hello";
-int := 1:sht;
-flt := "wrong";
-i := true;
-w := 32767;
-b := 125;
-
-# test for coercion errors
-x0 := "1":int; io.print(x0);
-x1 := 3.2:int; io.print(x1);
-x2 := 3:str; io.print(x2);
-x3 := 257:bte;
-x4 := -1:bte;
-x5 := -0:wrd;
diff --git a/monetdb5/mal/Tests/tst116.malC b/monetdb5/mal/Tests/tst116.malC
new file mode 100644
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
