Changeset 138058 in webkit

Timestamp:

Dec 18, 2012 1:02:45 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Build fix after r138045.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._collect_tests): Use relative_path. We skip only when this path
is not explicitly specified. The condition was backwards but never matched so we
always ran the test regardless of whether it's listed in the skipped list or not.

• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(test_collect_tests_with_ignored_skipped_list): Renamed so that it actually runs.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Build fix after r138045.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner._collect_tests): Use relative_path. We skip only when this path
+        is not explicitly specified. The condition was backwards but never matched so we
+        always ran the test regardless of whether it's listed in the skipped list or not.
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (test_collect_tests_with_ignored_skipped_list): Renamed so that it actually runs.
+
 2012-12-18  Emil A Eklund  <eae@chromium.org>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -154 +154 @@
         for path in test_files:
             relative_path = filesystem.relpath(path, self._base_path).replace('\\', '/')
-            if self._options.use_skipped_list and self._port.skips_perf_test(relative_path) and filesystem.normpath(path) in paths:
+            if self._options.use_skipped_list and self._port.skips_perf_test(relative_path) and filesystem.normpath(relative_path) not in paths:
                 continue
             test = PerfTestFactory.create_perf_test(self._port, relative_path, path)

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@ -581 +581 @@
             ['SkippedSuite/Test1.html', 'Suite/SkippedTest1.html', 'Suite/Test1.html'])
 
-    def test_collect_tests_with_skipped_list(self):
+    def test_collect_tests_with_ignored_skipped_list(self):
         runner, port = self.create_runner(args=['--force'])