Commit 3cb67f0e authored by dtu's avatar dtu Committed by Commit bot

[telemetry] Fix blink_perf Skipped.

BUG=396001
TEST=tools/perf/run_benchmark --browser=system --also-run-disabled-tests blink_perf.mutation  # Produces 0 tests.
TBR=tonyg
NOTRY=True

Review URL: https://codereview.chromium.org/573983002

Cr-Commit-Position: refs/heads/master@{#295028}
parent 5ccb52bc
...@@ -35,8 +35,7 @@ def _CreatePageSetFromPath(path, skipped_file): ...@@ -35,8 +35,7 @@ def _CreatePageSetFromPath(path, skipped_file):
if candidate_path == 'resources': if candidate_path == 'resources':
continue continue
candidate_path = os.path.join(dir_path, candidate_path) candidate_path = os.path.join(dir_path, candidate_path)
if candidate_path.startswith(tuple([os.path.join(path, s) if candidate_path.startswith(skipped):
for s in skipped])):
continue continue
if os.path.isdir(candidate_path): if os.path.isdir(candidate_path):
_AddDir(candidate_path, skipped) _AddDir(candidate_path, skipped)
...@@ -49,8 +48,9 @@ def _CreatePageSetFromPath(path, skipped_file): ...@@ -49,8 +48,9 @@ def _CreatePageSetFromPath(path, skipped_file):
for line in open(skipped_file, 'r').readlines(): for line in open(skipped_file, 'r').readlines():
line = line.strip() line = line.strip()
if line and not line.startswith('#'): if line and not line.startswith('#'):
skipped.append(line.replace('/', os.sep)) skipped_path = os.path.join(os.path.dirname(skipped_file), line)
_AddDir(path, skipped) skipped.append(skipped_path.replace('/', os.sep))
_AddDir(path, tuple(skipped))
else: else:
_AddPage(path) _AddPage(path)
ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs) ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment