Skip to content

Commit

Permalink
tools: expose skip output to test runner
Browse files Browse the repository at this point in the history
In the TAP protocol, skips are flagged as ok. Expose more
information so we can understand if the test was skipped or not.

PR-URL: #2130
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
jbergstroem committed Jul 30, 2015
1 parent 24dd016 commit 3cbb587
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions tools/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from Queue import Queue, Empty

logger = logging.getLogger('testrunner')
skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE)

VERBOSE = False

Expand Down Expand Up @@ -256,7 +257,12 @@ def HasRun(self, output):
for l in output.output.stdout.splitlines():
logger.info('#' + l)
else:
logger.info('ok %i - %s' % (self._done, command))
skip = skip_regex.search(output.output.stdout)
if skip:
logger.info(
'ok %i - %s # skip %s' % (self._done, command, skip.group(1)))
else:
logger.info('ok %i - %s' % (self._done, command))

duration = output.test.duration

Expand Down Expand Up @@ -1259,10 +1265,10 @@ def BuildOptions():
result.add_option("--no-suppress-dialogs", help="Display Windows dialogs for crashing tests",
dest="suppress_dialogs", action="store_false")
result.add_option("--shell", help="Path to V8 shell", default="shell")
result.add_option("--store-unexpected-output",
result.add_option("--store-unexpected-output",
help="Store the temporary JS files from tests that fails",
dest="store_unexpected_output", default=True, action="store_true")
result.add_option("--no-store-unexpected-output",
result.add_option("--no-store-unexpected-output",
help="Deletes the temporary JS files from tests that fails",
dest="store_unexpected_output", action="store_false")
return result
Expand Down

0 comments on commit 3cbb587

Please sign in to comment.