Browse Source

prism-auto: tweak exit code handling in --verbose-test mode

If --verbose-test is on, we want to also count failure exit codes
from the PRISM calls as failures.
master
Joachim Klein 8 years ago
parent
commit
05e7aedd95
  1. 19
      prism/etc/scripts/prism-auto

19
prism/etc/scripts/prism-auto

@ -557,20 +557,21 @@ def runPrism(args, dir=""):
else: else:
# We don't print it, but we count it # We don't print it, but we count it
countTestResult(line) countTestResult(line)
elif re.match('Error:', line):
printTestResult(line)
elif options.verboseTest: elif options.verboseTest:
# in verbose mode, also print the non-matching lines # in verbose mode, also print the non-matching lines
# rstrip to remove newline before printing # rstrip to remove newline before printing
print(line.rstrip()) print(line.rstrip())
sys.stdout.flush() sys.stdout.flush()
if options.test and not options.verboseTest and exitCode != 0:
# failure, we don't want to cleanup the log (if it was a temporary file)
# so that the user can inspect it
cleanupLogFile = False
for line in open(logFile, 'r').readlines():
if re.match('Error:', line):
printTestResult(line)
print("To see log file, run:")
print("edit " + logFile)
if options.test and exitCode != 0:
# failure
if not options.verboseTest:
# we don't want to cleanup the log (if it was a temporary file)
# so that the user can inspect it
cleanupLogFile = False
print("To see log file, run:")
print("edit " + logFile)
if not options.testAll: if not options.testAll:
closeDown(1) closeDown(1)
if cleanupLogFile: if cleanupLogFile:

Loading…
Cancel
Save