[telemetry] Fix blink_perf Skipped.

tools/perf/benchmarks/blink_perf.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_set
 from telemetry.page import page_test
@@ skipping 17 matching lines @@
     if '../' in open(path, 'r').read():
       # If the page looks like it references its parent dir, include it.
       serving_dirs.add(os.path.dirname(os.path.dirname(path)))
     page_urls.append('file://' + path.replace('\\', '/'))
 
   def _AddDir(dir_path, skipped):
     for candidate_path in os.listdir(dir_path):
       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)
       else:
         _AddPage(candidate_path)
 
   if os.path.isdir(path):
     skipped = []
     if os.path.exists(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)
   for url in page_urls:
     ps.AddPageWithDefaultRunNavigate(url)
   return ps
 
 
 class _BlinkPerfMeasurement(page_test.PageTest):
   """Tuns a blink performance test and reports the results."""
@@ skipping 165 matching lines @@
 
 
 @benchmark.Enabled('android')
 class BlinkPerfXMLHttpRequest(benchmark.Benchmark):
   tag = 'xml_http_request'
   test = _BlinkPerfMeasurement
 
   def CreatePageSet(self, options):
     path = os.path.join(BLINK_PERF_BASE_DIR, 'XMLHttpRequest')
     return _CreatePageSetFromPath(path, SKIPPED_FILE)