Changeset: 1d3bbe584251 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d3bbe584251 Added Files: monetdb5/mal/Tests/emptyblk.malC monetdb5/mal/Tests/emptyblk.stable.err monetdb5/mal/Tests/emptyblk.stable.out Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/malids.malC Branch: malparsing Log Message:
Approve output diffs (107 lines): diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All --- a/monetdb5/mal/Tests/All +++ b/monetdb5/mal/Tests/All @@ -201,3 +201,4 @@ flowchk dynamicload pithole malids +emptyblk diff --git a/monetdb5/mal/Tests/emptyblk.malC b/monetdb5/mal/Tests/emptyblk.malC new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/emptyblk.malC @@ -0,0 +1,4 @@ +#simple test dealing with a blanc ending +#caused evalFile issues +io.print(1); + diff --git a/monetdb5/mal/Tests/emptyblk.stable.err b/monetdb5/mal/Tests/emptyblk.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/emptyblk.stable.err @@ -0,0 +1,34 @@ +stderr of test 'emptyblk` in directory 'monetdb5/mal` itself: + + +# 11:56:21 > +# 11:56:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37641" "--set" "mapi_usock=/var/tmp/mtest-10719/.s.monetdb.37641" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" +# 11:56:21 > + +# 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 = 37641 +# cmdline opt mapi_usock = /var/tmp/mtest-10719/.s.monetdb.37641 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal +# cmdline opt gdk_debug = 536870922 + +# 11:56:21 > +# 11:56:21 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-10719" "--port=37641" +# 11:56:21 > + + +# 11:56:21 > +# 11:56:21 > "Done." +# 11:56:21 > + diff --git a/monetdb5/mal/Tests/emptyblk.stable.out b/monetdb5/mal/Tests/emptyblk.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/mal/Tests/emptyblk.stable.out @@ -0,0 +1,32 @@ +stdout of test 'emptyblk` in directory 'monetdb5/mal` itself: + + +# 11:56:21 > +# 11:56:21 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37641" "--set" "mapi_usock=/var/tmp/mtest-10719/.s.monetdb.37641" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_mal" +# 11:56:21 > + +# MonetDB 5 server v11.26.0 +# This is an unreleased version +# Serving database 'mTests_monetdb5_mal', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 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:37641/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10719/.s.monetdb.37641 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 11:56:21 > +# 11:56:21 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-10719" "--port=37641" +# 11:56:21 > + +[ 1 ] + +# 11:56:21 > +# 11:56:21 > "Done." +# 11:56:21 > + diff --git a/monetdb5/mal/Tests/malids.malC b/monetdb5/mal/Tests/malids.malC --- a/monetdb5/mal/Tests/malids.malC +++ b/monetdb5/mal/Tests/malids.malC @@ -1,8 +1,8 @@ module cip_chop; -atom cipchop1 : oid; +atom cipchop1:oid; -atom cip_chop1 : oid; +atom cip_chop1:oid; command foo1(:bat[:oid]) :bat[:oid] address MATHpi; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
