Changeset: a5474c799755 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5474c799755
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst251.maltest
testing/mktest.py
Branch: mtest
Log Message:
more robust detection of barier/exit
diffs (97 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -120,7 +120,7 @@ tst233
tst234
tst235
tst237
-tst250 #incorrect, misses last answer
+tst250
tst2500
tst2501
tst2502
@@ -128,7 +128,7 @@ tst2503
tst2504
tst2505
tst2510
-tst251 # incorrect, misses last answer
+tst251
tst252
tst255
tst2550
diff --git a/monetdb5/mal/Tests/tst251.maltest
b/monetdb5/mal/Tests/tst251.maltest
--- a/monetdb5/mal/Tests/tst251.maltest
+++ b/monetdb5/mal/Tests/tst251.maltest
@@ -1,46 +1,38 @@
statement ok
-c:= bat.new(:str)
+c:= bat.new(:str);
statement ok
-bat.append(c,"hello")
+bat.append(c,"hello");
statement ok
-bat.append(c,"brave")
+bat.append(c,"brave");
statement ok
-bat.append(c,"world")
+bat.append(c,"world");
statement ok
-bat.append(c,"")
+bat.append(c,"");
statement ok
-x:= calc.str(nil)
+x:= calc.str(nil);
statement ok
-bat.append(c,x)
+bat.append(c,x);
statement ok
-bat.append(c,"!")
+bat.append(c,"!");
query TT rowsort
-io.print(c)
+io.print(c);
----
12 values hashing to 7621f20bcb9c64b3a189dc2c9a005bb4
-statement ok
-barrier (h,ts):= iterator.new(c)
-
-statement ok
- io.printf("[%d,",h)
-
-statement ok
- io.printf("%s]\n",ts)
-
-statement ok
- redo (h,ts):= iterator.next(c)
-
query T rowsort
-exit (h,ts)
+barrier (h,ts):= iterator.new(c);
+ io.printf("[%d,",h);
+ io.printf("%s]\n",ts);
+ redo (h,ts):= iterator.next(c);
+exit (h,ts);
----
0,hello
1,brave
diff --git a/testing/mktest.py b/testing/mktest.py
--- a/testing/mktest.py
+++ b/testing/mktest.py
@@ -96,7 +96,7 @@ def is_complete_stmt(query, line:str):
if re.match(r'\s*function\s', stmt) is not None:
return re.match(r'\s*function\s.*\bend(\s+\w+)?\s*;', stmt,
re.DOTALL) is not None
if re.match(r'\s*barrier\s', stmt) is not None:
- return re.match(r'\s*barrier\s.*\bexit\s\(\w+(,\w)+\)\s*;', stmt,
re.DOTALL) is not None
+ return re.match(r'\s*barrier\s.*\bexit\s\(\w+(,\w+)+\)\s*;', stmt,
re.DOTALL) is not None
return re.match(r'[^;]*;', stmt) is not None
def is_copyfrom_stmt(stmt:str):
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
