Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(230)

Unified Diff: tools/perf/benchmarks/blink_perf.py

Issue 573983002: [telemetry] Fix blink_perf Skipped. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/benchmarks/blink_perf.py
diff --git a/tools/perf/benchmarks/blink_perf.py b/tools/perf/benchmarks/blink_perf.py
index 8fb4a8f4310972717ed5bc12ae043fa23aa3ae89..64eaca492af63afce3f62b6bf4cc44d038fd3a4c 100644
--- a/tools/perf/benchmarks/blink_perf.py
+++ b/tools/perf/benchmarks/blink_perf.py
@@ -35,8 +35,7 @@ def _CreatePageSetFromPath(path, skipped_file):
if candidate_path == 'resources':
continue
candidate_path = os.path.join(dir_path, candidate_path)
- if candidate_path.startswith(tuple([os.path.join(path, s)
- for s in skipped])):
+ if candidate_path.startswith(skipped):
continue
if os.path.isdir(candidate_path):
_AddDir(candidate_path, skipped)
@@ -49,8 +48,9 @@ def _CreatePageSetFromPath(path, skipped_file):
for line in open(skipped_file, 'r').readlines():
line = line.strip()
if line and not line.startswith('#'):
- skipped.append(line.replace('/', os.sep))
- _AddDir(path, skipped)
+ skipped_path = os.path.join(os.path.dirname(skipped_file), line)
+ skipped.append(skipped_path.replace('/', os.sep))
+ _AddDir(path, tuple(skipped))
else:
_AddPage(path)
ps = page_set.PageSet(file_path=os.getcwd()+os.sep, serving_dirs=serving_dirs)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698