Changeset: a68ce2845008 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a68ce2845008
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (70 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3973,6 +3973,7 @@ def main(argv) :
body_good = []
body_bad = []
test_progress = 0
+ errseen = False
try:
if len(testdirs) == 1:
if testlist:
@@ -3987,6 +3988,8 @@ def main(argv) :
body_good.append(elem)
else:
body_bad.append(elem)
+ if not errseen and diff > F_WARN:
+ errseen = True
else:
if verbosity > 1:
print("\nRunning all tests in directories %s.\n" %
str(testdirs))
@@ -3998,6 +4001,8 @@ def main(argv) :
body_good.append(elem)
else:
body_bad.append(elem)
+ if not errseen and diff > F_WARN:
+ errseen = True
if interrupted:
break
if not testweb:
@@ -4142,7 +4147,7 @@ VALUES (%s, '%s', '%s', '%s',
what += " %s\n" % f
print(file=sys.stderr, end='', flush=True)
if verbosity == 0:
- if Failed:
+ if Failed or errseen:
prred('ERROR')
else:
prgreen('OK')
@@ -4168,7 +4173,21 @@ VALUES (%s, '%s', '%s', '%s',
After that, re-run Mtest.
""" % os.path.join(TSTTRGBASE, TSTPREF, "index.html"))
- sys.exit(1)
+ elif errseen:
+ print("""\
+
+ !ERROR: Testing FAILED in some directories
+""")
+ if not testweb and produce_html:
+ print("""\
+ First, check the testing results in %s !
+
+ Then, fix the problems by:
+ - fixing sources and test scripts
+ - fixing stable output by hand
+
+ After that, re-run Mtest.
+""" % os.path.join(TSTTRGBASE, TSTPREF, "index.html"))
else:
if verbosity == 0:
pass
@@ -4181,7 +4200,7 @@ VALUES (%s, '%s', '%s', '%s',
""")
else:
print("No differences encountered during testing.")
- sys.exit(0)
+ sys.exit(1 if Failed or errseen else 0)
finally:
# cleanup the place where we put our UNIX sockets
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
