|
49 | 49 | from Queue import Queue, Empty
|
50 | 50 |
|
51 | 51 | logger = logging.getLogger('testrunner')
|
| 52 | +skip_regex = re.compile(r'# SKIP\S*\s+(.*)', re.IGNORECASE) |
52 | 53 |
|
53 | 54 | VERBOSE = False
|
54 | 55 |
|
@@ -256,7 +257,12 @@ def HasRun(self, output):
|
256 | 257 | for l in output.output.stdout.splitlines():
|
257 | 258 | logger.info('#' + l)
|
258 | 259 | else:
|
259 |
| - logger.info('ok %i - %s' % (self._done, command)) |
| 260 | + skip = skip_regex.search(output.output.stdout) |
| 261 | + if skip: |
| 262 | + logger.info( |
| 263 | + 'ok %i - %s # skip %s' % (self._done, command, skip.group(1))) |
| 264 | + else: |
| 265 | + logger.info('ok %i - %s' % (self._done, command)) |
260 | 266 |
|
261 | 267 | duration = output.test.duration
|
262 | 268 |
|
@@ -1259,10 +1265,10 @@ def BuildOptions():
|
1259 | 1265 | result.add_option("--no-suppress-dialogs", help="Display Windows dialogs for crashing tests",
|
1260 | 1266 | dest="suppress_dialogs", action="store_false")
|
1261 | 1267 | result.add_option("--shell", help="Path to V8 shell", default="shell")
|
1262 |
| - result.add_option("--store-unexpected-output", |
| 1268 | + result.add_option("--store-unexpected-output", |
1263 | 1269 | help="Store the temporary JS files from tests that fails",
|
1264 | 1270 | dest="store_unexpected_output", default=True, action="store_true")
|
1265 |
| - result.add_option("--no-store-unexpected-output", |
| 1271 | + result.add_option("--no-store-unexpected-output", |
1266 | 1272 | help="Deletes the temporary JS files from tests that fails",
|
1267 | 1273 | dest="store_unexpected_output", action="store_false")
|
1268 | 1274 | return result
|
|
0 commit comments