Changeset: e9d4e146469f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e9d4e146469f
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (89 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -757,3 +757,4 @@ 00463fdd0d51d7ce058549a82bc74efaea6035a2
00463fdd0d51d7ce058549a82bc74efaea6035a2 Jul2021_SP3_release
db3cec8ea853884e857fcfb413428116cb95e786 Jul2021_17
8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_19
+8c015afafb5903ea59b0e2cffac1138a0d82e007 Jul2021_SP4_release
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2294,6 +2294,41 @@ def RunTest(env, TST, COND, oktests, len
else:
diff_html.write('<!--NoDiffs-->\n')
diff_html.close()
+
+ if verbosity <= 1:
+ if verbosity == 0 and (FailedOut > F_WARN or FailedErr >
F_WARN):
+ print('\r', ' '*(ttywidth or 100), end='', sep='')
+ print('\r', end='', sep='')
+ if tres == 'socket':
+ prpurple('SOCKET')
+ elif tres == 'timeout':
+ prpurple('TIMEOUT')
+ elif tres == 'recursion':
+ prpurple('RECURSION')
+ elif tres == 'segfault':
+ prpurple('CRASHED')
+ elif tres == 'abort':
+ prpurple('ABORTED')
+ elif tres == 'signal':
+ prpurple('SIGNALED')
+ elif verbosity == 0 and (FailedOut > F_WARN or FailedErr >
F_WARN):
+ prred('ERROR')
+ elif verbosity == 1:
+ if FailedOut == F_OK:
+ prgreen('OK ')
+ elif FailedOut == F_WARN:
+ prgreen('minor')
+ else:
+ prred('ERROR')
+ print(' ', end='')
+ if FailedErr == F_OK:
+ prgreen('OK')
+ elif FailedErr == F_WARN:
+ prgreen('minor')
+ else:
+ prred('ERROR')
+ if verbosity == 0 and (FailedOut > F_WARN or FailedErr >
F_WARN):
+ print(':', os.path.join(TSTDIR, TST + EXT))
elif FailedOut > F_WARN or FailedErr > F_WARN:
print()
print('========================================')
@@ -2319,35 +2354,6 @@ def RunTest(env, TST, COND, oktests, len
elem = AddTstToHtmlIndex(env, TST, STABLEout, STABLEerr, EXT,
FailedOut, FailedErr)
- if verbosity == 1:
- if tres == 'socket':
- prpurple('SOCKET')
- elif tres == 'timeout':
- prpurple('TIMEOUT')
- elif tres == 'recursion':
- prpurple('RECURSION')
- elif tres == 'segfault':
- prpurple('CRASHED')
- elif tres == 'abort':
- prpurple('ABORTED')
- elif tres == 'signal':
- prpurple('SIGNALED')
- else:
- if FailedOut == F_OK:
- prgreen('OK ')
- elif FailedOut == F_WARN:
- prgreen('minor')
- else:
- prred('MAJOR')
- print(' ', end='')
- if FailedErr == F_OK:
- prgreen('OK')
- elif FailedErr == F_WARN:
- prgreen('minor')
- else:
- prred('MAJOR')
- print()
-
return TX,FailedOut,FailedErr,elem,reason,links
### RunTest(env, TST, COND, oktests) #
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
