Changeset 83783 in webkit

Timestamp:

Apr 13, 2011 4:04:01 PM (13 years ago)

Author:

mihaip@chromium.org

Message:

2011-04-13 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Eric Seidel.

[NRWT] Rename --baseline-search-patch to --additional-platform-directory to match ORWT
​https://bugs.webkit.org/show_bug.cgi?id=58489

r83743 added --additional-platform-directory to old-run-webkit-tests,
rename the equivalent flag in new-run-webkit-tests to be consistent.

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/base_unittest.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [NRWT] Rename --baseline-search-patch to --additional-platform-directory to match ORWT
+        https://bugs.webkit.org/show_bug.cgi?id=58489
+        
+        r83743 added --additional-platform-directory to old-run-webkit-tests,
+        rename the equivalent flag in new-run-webkit-tests to be consistent.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-04-13  Mihai Parparita  <mihaip@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -286 +286 @@
         baseline_filename = testname + '-expected' + suffix
 
-        baseline_search_path = self.get_option('baseline_search_path', []) + self.baseline_search_path()
+        baseline_search_path = self.get_option('additional_platform_directory', []) + self.baseline_search_path()
 
         baselines = []

trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py

@@ -233 +233 @@
         self.assertEqual(port.name(), 'foo')
 
-    def test_baseline_search_path(self):
+    def test_additional_platform_directory(self):
         filesystem = MockFileSystem()
         options, args = optparse.OptionParser().parse_args([])
@@ -241 +241 @@
         test_file = filesystem.join(layout_test_dir, 'fast', 'test.html')
 
-        # No baseline search path
+        # No additional platform directory
         self.assertEqual(
             port.expected_baselines(test_file, '.txt'),
             [(None, 'fast/test-expected.txt')])
 
-        # Simple search path
-        options.baseline_search_path = ['/tmp/local-baselines']
+        # Simple additional platform directory
+        options.additional_platform_directory = ['/tmp/local-baselines']
         filesystem.files = {
             '/tmp/local-baselines/fast/test-expected.txt': 'foo',
@@ -255 +255 @@
             [('/tmp/local-baselines', 'fast/test-expected.txt')])
 
-        # Multiple entries in search path
-        options.baseline_search_path = ['/foo', '/tmp/local-baselines']
+        # Multiple additional platform directories
+        options.additional_platform_directory = ['/foo', '/tmp/local-baselines']
         self.assertEqual(
             port.expected_baselines(test_file, '.txt'),

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -161 +161 @@
     options.slow_time_out_ms = str(5 * int(options.time_out_ms))
 
-    if options.baseline_search_path:
-        normalized_search_paths = []
-        for path in options.baseline_search_path:
+    if options.additional_platform_directory:
+        normalized_platform_directories = []
+        for path in options.additional_platform_directory:
             if not port_obj._filesystem.isabs(path):
-                warnings.append("--baseline-search-path=%s is ignored since it is not absolute" % path)
+                warnings.append("--additional-platform-directory=%s is ignored since it is not absolute" % path)
                 continue
-            normalized_search_paths.append(port_obj._filesystem.normpath(path))
-        options.baseline_search_path = normalized_search_paths
+            normalized_platform_directories.append(port_obj._filesystem.normpath(path))
+        options.additional_platform_directory = normalized_platform_directories
 
     return warnings
@@ -293 +293 @@
             default=False, help="Reset any existing baselines to the "
                  "generated results"),
-        optparse.make_option("--baseline-search-path", action="append",
+        optparse.make_option("--additional-platform-directory", action="append",
             default=[], help="Additional directory where to look for test "
                  "baselines (will take precendence over platform baselines). "

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

@@ -576 +576 @@
         self.assertEquals(['passes/mismatch.html', 'passes/mismatch-expected-mismatch.html'], tests_run)
 
-    def test_baseline_search_path(self):
-        self.assertTrue(passing_run(['--baseline-search-path', '/tmp/foo']))
-        self.assertTrue(passing_run(['--baseline-search-path', '/tmp/../foo']))
-        self.assertTrue(passing_run(['--baseline-search-path', '/tmp/foo',
-            '--baseline-search-path', '/tmp/bar']))
+    def test_additional_platform_directory(self):
+        self.assertTrue(passing_run(['--additional-platform-directory', '/tmp/foo']))
+        self.assertTrue(passing_run(['--additional-platform-directory', '/tmp/../foo']))
+        self.assertTrue(passing_run(['--additional-platform-directory', '/tmp/foo',
+            '--additional-platform-directory', '/tmp/bar']))
 
         res, buildbot_output, regular_output, user = logging_run(
-             ['--baseline-search-path', 'foo'])
-        self.assertTrue('--baseline-search-path=foo is ignored since it is not absolute\n'
+             ['--additional-platform-directory', 'foo'])
+        self.assertTrue('--additional-platform-directory=foo is ignored since it is not absolute\n'
                         in regular_output.get())