Changeset: 955cf6e69247 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=955cf6e69247 Added Files: monetdb5/mal/Tests/tst012.maltest monetdb5/mal/Tests/tst013.maltest monetdb5/mal/Tests/tst014.maltest monetdb5/mal/Tests/tst015.maltest monetdb5/mal/Tests/tst016.maltest monetdb5/mal/Tests/tst017.malC monetdb5/mal/Tests/tst017.maltest monetdb5/mal/Tests/tst018.maltest monetdb5/mal/Tests/tst019.maltest monetdb5/mal/Tests/tst020.maltest monetdb5/mal/Tests/tst021.maltest monetdb5/mal/Tests/tst022.maltest Modified Files: monetdb5/mal/Tests/All monetdb5/mal/Tests/tst001.maltest monetdb5/mal/Tests/tst002.maltest monetdb5/mal/Tests/tst003.maltest monetdb5/mal/Tests/tst004.maltest monetdb5/mal/Tests/tst005.maltest monetdb5/mal/Tests/tst006.maltest monetdb5/mal/Tests/tst007.maltest monetdb5/mal/Tests/tst008.maltest monetdb5/mal/Tests/tst009.maltest monetdb5/mal/Tests/tst010.maltest monetdb5/mal/Tests/tst011.maltest monetdb5/mal/Tests/tst015.malC monetdb5/mal/Tests/tst077.malC Branch: mtest Log Message:
First batch, double checked diffs (truncated from 1094 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 @@ -10,80 +10,80 @@ tst008 tst009 tst010 tst011 -# tst012 -# tst013 -# tst014 -# tst015 -# tst016 -# tst018 -# tst019 -# tst020 -# tst021 -# tst022 -# tst023 -# tst024 -# tst025 -# tst026 -# tst027 -# tst028 -# tst029 -# tst030 -# tst031 -# tst032 -# tst033 -# tst034 -# tst035 -# tst036 -# tst037 -# tst038 -# tst039 -# tst041 -# tst042 -# tst043 -# tst044 -# tst045 -# tst046 -# tst047 -# tst048 -# tst049 -# tst050 -# tst051 -# tst052 -# tst053 -# tst054 -# tst055 -# tst056 -# tst057 -# tst058 -# tst059 -# tst060 -# tst061 -# tst070 -# tst071 -# tst072 -# tst074 -# tst075 -# tst077 -# tst100 -# tst1000 -# tst1002 -# tst1004 -# tst101 -# tst1012 -# tst102 -# tst103 -# tst107 -# tst108 -# tst109 -# tst110 -# tst111 -# tst112 -# tst113 -# tst114 -# tst117 -# tst115 -# tst116 -# tst1150 +tst012 +tst013 +tst017 +tst014 +tst015 +tst016 +tst018 +tst019 +tst020 +tst021 +tst022 +#tst023 +#tst024 +#tst025 +#tst026 +#tst027 +#tst028 +#tst029 +#tst030 +#tst031 +#tst032 +#tst033 +#tst034 +#tst035 +#tst036 +#tst037 +#tst038 +#tst039 +#tst041 +#tst042 +#tst043 +#tst044 +#tst045 +#tst046 +#tst047 +#tst048 +#tst049 +#tst050 +#tst051 +#tst052 +#tst053 +#tst054 +#tst055 +#tst056 +#tst057 +#tst058 +#tst059 +#tst060 +#tst061 +#tst070 +#tst071 +#tst072 +#tst074 +#tst075 +## tst077 +#tst100 +#tst1000 +#tst1004 +#tst101 +#tst1012 +#tst102 +#tst103 +#tst107 +#tst108 +#tst109 +#tst110 +#tst111 +#tst112 +#tst113 +#tst114 +#tst117 +#tst115 +#tst116 +#tst1150 # #tst120 files are not located in module and paths are runtime dependent # #tst1200 # #tst1204 diff --git a/monetdb5/mal/Tests/tst001.maltest b/monetdb5/mal/Tests/tst001.maltest --- a/monetdb5/mal/Tests/tst001.maltest +++ b/monetdb5/mal/Tests/tst001.maltest @@ -1,5 +1,5 @@ query T rowsort -io.printf("hello world\n") +io.printf("hello world\n"); ---- hello world diff --git a/monetdb5/mal/Tests/tst002.maltest b/monetdb5/mal/Tests/tst002.maltest --- a/monetdb5/mal/Tests/tst002.maltest +++ b/monetdb5/mal/Tests/tst002.maltest @@ -1,19 +1,12 @@ statement error - true:= 23 + true:= 23; statement error - false:= 24 - -statement ok -barrier barrier:= true + false:= 24; statement ok - b:= true - -statement ok - b:= false +barrier barrier:= true; + b:= true; + b:= false; +exit barrier; -statement ok -exit barrier - - diff --git a/monetdb5/mal/Tests/tst003.maltest b/monetdb5/mal/Tests/tst003.maltest --- a/monetdb5/mal/Tests/tst003.maltest +++ b/monetdb5/mal/Tests/tst003.maltest @@ -1,7 +1,7 @@ statement error -function foo() -a:=b; #b not yet defined -b:=c; #c undefined +function foo(); + a:=b; + b:=c; end foo diff --git a/monetdb5/mal/Tests/tst004.maltest b/monetdb5/mal/Tests/tst004.maltest --- a/monetdb5/mal/Tests/tst004.maltest +++ b/monetdb5/mal/Tests/tst004.maltest @@ -1,40 +1,17 @@ statement ok -function foo() - -statement ok -barrier l:=1 - -statement ok - io.print(l) - -statement ok -exit l:= 2 - -statement ok - io.print(l) - -statement ok -barrier m:=3 - -statement ok - leave m - -statement ok -exit m:= 4 - -statement ok - io.print(m) - -statement ok -end foo +function foo(); +barrier l:=1; + io.print(l); +exit l:= 2; + io.print(l); +barrier m:=3; + leave m; +exit m:= 4; + io.print(m); +end foo; query T rowsort -mdb.List("user","foo") ----- -end user.foo;@#[9] (0) - -query T rowsort -user.foo() +user.foo(); ---- 1 2 diff --git a/monetdb5/mal/Tests/tst005.maltest b/monetdb5/mal/Tests/tst005.maltest --- a/monetdb5/mal/Tests/tst005.maltest +++ b/monetdb5/mal/Tests/tst005.maltest @@ -1,79 +1,34 @@ statement ok -function foo() - -statement ok - i:= 1 - -statement ok - j:= 2 - -statement ok -barrier v:=i - -statement ok - io.print("entered") - -statement ok - io.print(v) - -statement ok - redo v:= iterator.next(-1,0) - -statement ok -exit v - -statement ok - io.print("doubles") - -statement ok - i:= 1 - _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list