Changeset: b7d991cd508a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b7d991cd508a
Modified Files:
        testing/sqllogictest.py
Branch: default
Log Message:

Merge with Sep2022 branch.


diffs (40 lines):

diff --git a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.test 
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.test
--- a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.test
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.test
@@ -1,6 +1,13 @@
+skipif arch=aarch64
 statement error 22003!overflow in conversion of 9.2233720368547758e+18 to lng.
 select cast(power(2,63) as bigint) 
 
+onlyif arch=aarch64
+query I
+select cast(power(2,63) as bigint) 
+----
+9223372036854775807
+
 statement error 22003!overflow in conversion of 1.8446744073709552e+19 to lng.
 select cast(power(2,64) as bigint)
 
diff --git a/testing/sqllogictest.py b/testing/sqllogictest.py
--- a/testing/sqllogictest.py
+++ b/testing/sqllogictest.py
@@ -35,6 +35,7 @@ import MonetDBtesting.malmapi as malmapi
 import hashlib
 import re
 import sys
+import os
 import importlib
 import MonetDBtesting.utils as utils
 from pathlib import Path
@@ -686,9 +687,9 @@ class SQLLogic:
             if not words:
                 continue
             while words[0] == 'skipif' or words[0] == 'onlyif':
-                if words[0] == 'skipif' and words[1] == 'MonetDB':
+                if words[0] == 'skipif' and words[1] in ('MonetDB', 
f'arch={os.uname().machine}'):
                     skipping = True
-                elif words[0] == 'onlyif' and words[1] != 'MonetDB':
+                elif words[0] == 'onlyif' and words[1] not in ('MonetDB', 
f'arch={os.uname().machine}'):
                     skipping = True
                 self.writeline(line.rstrip())
                 line = self.readline()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to