MonetDB: mtest - detect barrier/exit

[Niels Nes]

Changeset: 1f1731b1be60 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f1731b1be60
Modified Files:
        monetdb5/mal/Tests/tst250.malC
        testing/mktest.py
Branch: mtest
Log Message:

detect barrier/exit
in case of mal don't strip ';'


diffs (40 lines):

diff --git a/monetdb5/mal/Tests/tst250.malC b/monetdb5/mal/Tests/tst250.malC
--- a/monetdb5/mal/Tests/tst250.malC
+++ b/monetdb5/mal/Tests/tst250.malC
@@ -16,8 +16,8 @@ err := bat.append(b,n0);
 err := bat.append(b,81);
 io.print(b);
 barrier (h,t):= iterator.new(b);
-       io.printf("%d,",h);
-       io.printf("%d\n",t);
+       io.printf("%d,",h); 
+       io.printf("%d:",t); 
        redo (h,t):= iterator.next(b);
+       io.printf("\n"); 
 exit (h,t);
-
diff --git a/testing/mktest.py b/testing/mktest.py
--- a/testing/mktest.py
+++ b/testing/mktest.py
@@ -95,6 +95,8 @@ def is_complete_stmt(query, line:str):
     else:
         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'[^;]*;', stmt) is not None
 
 def is_copyfrom_stmt(stmt:str):
@@ -256,7 +258,11 @@ while True:
         if res is not None:
             line = res.group(0)[:-1].rstrip()
     if is_complete_stmt(query, line):
-        query.append(line.rstrip(';'))
+        if opts.language == 'sql':
+            l = line.rstrip(';')
+        else:
+            l = line
+        query.append(l)
         to_sqllogic_test('\n'.join(query))
         query = []
     else:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list