Changeset: 7cb49814b409 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7cb49814b409
Modified Files:
testing/Mtest.py.in
testing/convert_to_sqllogic.sh
testing/helpers.py
Branch: mtest
Log Message:
fixes
diffs (51 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2756,8 +2756,11 @@ def main(argv) :
env['VERSION'] = os.environ['VERSION']
STDERR.flush()
-
- test_ctx = build_work_ctx(*args) if len(args) > 0 else
build_work_ctx(TSTSRCBASE)
+ try:
+ test_ctx = build_work_ctx(*args) if len(args) > 0 else
build_work_ctx(TSTSRCBASE)
+ except ValueError as e:
+ raise SystemExit(e)
+
test_count = test_ctx.get('test_count', 0)
env['test_count'] = test_count
diff --git a/testing/convert_to_sqllogic.sh b/testing/convert_to_sqllogic.sh
--- a/testing/convert_to_sqllogic.sh
+++ b/testing/convert_to_sqllogic.sh
@@ -49,7 +49,9 @@ done
files=()
if [[ -d "${src}" ]];then
- files=$(ls $src)
+ for f in $(ls $src);do
+ files+=" $src/$f";
+ done
fi
for f in $@;do
diff --git a/testing/helpers.py b/testing/helpers.py
--- a/testing/helpers.py
+++ b/testing/helpers.py
@@ -64,12 +64,12 @@ def process_test_dir(dir_path:str, ctx={
('.MAL.py', '.MAL.py', 'python', 'MAL'),
('.SQL.py', '.SQL.py', 'python', 'SQL'),
('.malC', '.malC', 'mal', 'MAL'),
- ('_s00.malC', '.malC', 'malXs', 'MAL'),
- ('_p00.malC', '.malC', 'malXp', 'MAL'),
+ #('_s00.malC', '.malC', 'malXs', 'MAL'),
+ #('_p00.malC', '.malC', 'malXp', 'MAL'),
('.test', '.test', 'sqltest','SQL'),
('.sql', '.sql', 'sql', 'SQL'),
- ('_s00.sql', '.sql', 'sqlXs', 'SQL'),
- ('_p00.sql', '.sql', 'sqlXp', 'SQL'),
+ #('_s00.sql', '.sql', 'sqlXs', 'SQL'),
+ #('_p00.sql', '.sql', 'sqlXp', 'SQL'),
('.R', '.R', 'R', 'SQL'),
('.rb', '.rb', 'ruby', 'SQL'),
)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
