Show More
@@ -361,7 +361,8 b' def parselistfiles(files, listtype, warn' | |||
|
361 | 361 | for line in f.readlines(): |
|
362 | 362 | line = line.split(b'#', 1)[0].strip() |
|
363 | 363 | if line: |
|
364 | entries[line] = filename | |
|
364 | # Ensure path entries are compatible with os.path.relpath() | |
|
365 | entries[os.path.normpath(line)] = filename | |
|
365 | 366 | |
|
366 | 367 | f.close() |
|
367 | 368 | return entries |
@@ -1116,15 +1116,17 b' Skips with xml' | |||
|
1116 | 1116 | </testsuite> |
|
1117 | 1117 | |
|
1118 | 1118 | Missing skips or blacklisted skips don't count as executed: |
|
1119 | $ echo test-failure.t > blacklist | |
|
1119 | $ mkdir tests | |
|
1120 | $ echo tests/test-failure.t > blacklist | |
|
1121 | $ cp test-failure.t tests | |
|
1120 | 1122 | $ rt --blacklist=blacklist --json\ |
|
1121 | > test-failure.t test-bogus.t | |
|
1123 | > tests/test-failure.t tests/test-bogus.t | |
|
1122 | 1124 | running 2 tests using 1 parallel processes |
|
1123 | 1125 | ss |
|
1124 | 1126 | Skipped test-bogus.t: Doesn't exist |
|
1125 | 1127 | Skipped test-failure.t: blacklisted |
|
1126 | 1128 | # Ran 0 tests, 2 skipped, 0 failed. |
|
1127 | $ cat report.json | |
|
1129 | $ cat tests/report.json | |
|
1128 | 1130 | testreport ={ |
|
1129 | 1131 | "test-bogus.t": { |
|
1130 | 1132 | "result": "skip" |
@@ -1133,6 +1135,8 b" Missing skips or blacklisted skips don't" | |||
|
1133 | 1135 | "result": "skip" |
|
1134 | 1136 | } |
|
1135 | 1137 | } (no-eol) |
|
1138 | $ rm -r tests | |
|
1139 | $ echo test-failure.t > blacklist | |
|
1136 | 1140 | |
|
1137 | 1141 | Whitelist trumps blacklist |
|
1138 | 1142 | $ echo test-failure.t > whitelist |
General Comments 0
You need to be logged in to leave comments.
Login now