Changeset: 2058de3a7b8d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2058de3a7b8d
Modified Files:
testing/Mtest.py.in
Branch: mtest
Log Message:
More fully ignore missing stable output when testing a .test file.
diffs (37 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2434,10 +2434,11 @@ def RunTest(env, TST, BusyPorts, COND, o
except IOError as err:
Warn("Flushing STDOUT in RunTest failed with #%d: '%s'." %
(err.errno, err.strerror))
- Mfilter.mFilter(TST+STABLEout,par['IGNORE'])
- Mfilter.mFilter(TST+STABLEerr,par['IGNORE'])
- Mfilter.mFilter(TST+".test.out",par['IGNORE'])
- Mfilter.mFilter(TST+".test.err",par['IGNORE'])
+ if not issqllogictest:
+ Mfilter.mFilter(TST+STABLEout,par['IGNORE'])
+ Mfilter.mFilter(TST+STABLEerr,par['IGNORE'])
+ Mfilter.mFilter(TST+".test.out",par['IGNORE'])
+ Mfilter.mFilter(TST+".test.err",par['IGNORE'])
if REV:
d = '%s%s/%s' % (URLPREFIX, url(TSTDIR), TSTSUFF)
@@ -2478,7 +2479,7 @@ def RunTest(env, TST, BusyPorts, COND, o
if tres is not None:
# test program exited with error => expect major differences!
ACCURACYout = -1
- else:
+ elif not issqllogictest:
szs = os.stat("%s%s.FILTERED" % (TST, STABLEout)).st_size
szt = os.stat("%s.test.out.FILTERED" % TST).st_size
if szt < szs*0.5 or szt > szs*1.5:
@@ -2554,7 +2555,7 @@ def RunTest(env, TST, BusyPorts, COND, o
if tres is not None:
# test program exited with error => expect major differences!
ACCURACYerr = -1
- else:
+ elif not issqllogictest:
szs = os.stat("%s%s.FILTERED" % (TST, STABLEerr)).st_size
szt = os.stat("%s.test.err.FILTERED" % TST).st_size
if szt < szs*0.5 or szt > szs*1.5:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
