From 3dd1680c6e984c89313db0ff1d9360de23af2954 Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Tue, 4 Jul 2017 10:21:44 +0000 Subject: [PATCH] prism-auto: count warnings / dd-warnings as well for statistic git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12004 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/etc/scripts/prism-auto | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/prism/etc/scripts/prism-auto b/prism/etc/scripts/prism-auto index 1a21613a..ac237b96 100755 --- a/prism/etc/scripts/prism-auto +++ b/prism/etc/scripts/prism-auto @@ -20,7 +20,7 @@ from optparse import OptionParser #================================================================================================== # statistics about test results -testStats = dict(SUCCESS = 0, FAILURE = 0, SKIPPED = 0, UNSUPPORTED = 0) +testStats = dict(SUCCESS = 0, FAILURE = 0, SKIPPED = 0, UNSUPPORTED = 0, WARNING = 0, DDWARNING = 0) # colour coding for test results # for colour values, see https://en.wikipedia.org/wiki/ANSI_escape_code#Colors @@ -462,16 +462,22 @@ def incrementTestStat(stat): def printTestStatistics(): if options.test and not options.echo: print('\nTest results:') - printColoured('SUCCESS', ' Success: ' + str(testStats['SUCCESS'])) - printColoured('FAILURE', ' Failure: ' + str(testStats['FAILURE'])) - printColoured('UNSUPPORTED', ' Unsupported: ' + str(testStats['UNSUPPORTED'])) - printColoured('SKIPPED', ' Skipped: ' + str(testStats['SKIPPED'])) + printColoured('SUCCESS', ' Success: ' + str(testStats['SUCCESS'])) + printColoured('FAILURE', ' Failure: ' + str(testStats['FAILURE'])) + printColoured('UNSUPPORTED', ' Unsupported: ' + str(testStats['UNSUPPORTED'])) + printColoured('SKIPPED', ' Skipped: ' + str(testStats['SKIPPED'])) + printColoured('WARNING', ' Warnings: ' + str(testStats['WARNING'])) + if (options.ddWarnings): + printColoured('WARNING', ' DD-Warnings: ' + str(testStats['DDWARNING'])) def countTestResult(msg): if 'Error:' in msg or 'FAIL' in msg: incrementTestStat('FAILURE') -# ignore warnings -# elif 'Warning:' in msg: + elif options.ddWarnings and re.match('Warning: CUDD reports .* non-zero references', msg): + incrementTestStat('WARNINGS') + incrementTestStat('DDWARNINGS') + elif 'Warning:' in msg: + incrementTestStat('WARNINGS') elif 'PASS' in msg: incrementTestStat('SUCCESS') elif 'SKIPPED' in msg or 'NOT TESTED' in msg: