Changeset 106389 in webkit

Timestamp:

Jan 31, 2012 1:46:09 PM (12 years ago)

Author:

ojan@chromium.org

Message:

Unreviewed, rolling out r106302.
​http://trac.webkit.org/changeset/106302
​https://bugs.webkit.org/show_bug.cgi?id=77472

Broke building DRT before running the tests (Requested by ojan
on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2012-01-31

• Scripts/webkit-build-directory:
• Scripts/webkitpy/layout_tests/port/config.py:

(Config.build_directory):

• Scripts/webkitpy/layout_tests/port/config_standalone.py:

(main):

• Scripts/webkitpy/layout_tests/port/config_unittest.py:

(ConfigTest.assert_configuration):
(ConfigTest.test_build_directory.mock_webkit_build_directory):
(ConfigTest.test_build_directory):
(ConfigTest.test_default_configurationnotfound):

• Scripts/webkitpy/layout_tests/port/webkit.py:

(WebKitPort._build_path):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit-build-directory (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/config.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/config_standalone.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/config_unittest.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-31  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r106302.
+        http://trac.webkit.org/changeset/106302
+        https://bugs.webkit.org/show_bug.cgi?id=77472
+
+        Broke building DRT before running the tests (Requested by ojan
+        on #webkit).
+
+        * Scripts/webkit-build-directory:
+        * Scripts/webkitpy/layout_tests/port/config.py:
+        (Config.build_directory):
+        * Scripts/webkitpy/layout_tests/port/config_standalone.py:
+        (main):
+        * Scripts/webkitpy/layout_tests/port/config_unittest.py:
+        (ConfigTest.assert_configuration):
+        (ConfigTest.test_build_directory.mock_webkit_build_directory):
+        (ConfigTest.test_build_directory):
+        (ConfigTest.test_default_configuration__notfound):
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+        (WebKitPort._build_path):
+
 2012-01-31  Antoine Labour  <piman@chromium.org>
 

trunk/Tools/Scripts/webkit-build-directory

@@ -58 +58 @@
 );
 
-if (!$getOptionsResult || $showHelp) {
+if (!$getOptionsResult || $showHelp || (!$showConfigurationDirectory && !$showTopLevelDirectory)) {
     print STDERR $usage;
     exit 1;
 }
 
-if (!$showConfigurationDirectory && !$showTopLevelDirectory) {
-    print baseProductDir() . "\n";
-    print productDir() . "\n";
-} elsif ($showTopLevelDirectory) {
+if ($showTopLevelDirectory) {
     print baseProductDir() . "\n";
 } else {

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

@@ -75 +75 @@
         else:
             configuration = ""
-            flags = []
+            flags = ["--top-level"]
 
         if not self._build_directories.get(configuration):
             args = ["perl", self.script_path("webkit-build-directory")] + flags
-            output = self._executive.run_command(args, cwd=self.webkit_base_dir()).rstrip()
-            parts = output.split("\n")
-            self._build_directories[configuration] = parts[0]
-
-            if len(parts) == 2:
-                default_configuration = parts[1][len(parts[0]):]
-                if default_configuration.startswith("/"):
-                    default_configuration = default_configuration[1:]
-                self._build_directories[default_configuration] = parts[1]
+            self._build_directories[configuration] = (
+                self._executive.run_command(args, cwd=self.webkit_base_dir()).rstrip())
 
         return self._build_directories[configuration]

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

@@ -58 +58 @@
 
     if len(argv) == 3 and argv[1] == '--mock':
-        e = executive_mock.MockExecutive2(output='foo\nfoo/%s' % argv[2])
+        e = executive_mock.MockExecutive2(output='foo')
         fs = filesystem_mock.MockFileSystem({'foo/Configuration': argv[2]})
     else:

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

@@ -52 +52 @@
         # This tests that a configuration file containing
         # _contents_ ends up being interpreted as _expected_.
-        output = 'foo\nfoo/%s' % contents
-        c = self.make_config(output, {'foo/Configuration': contents})
+        c = self.make_config('foo', {'foo/Configuration': contents})
         self.assertEqual(c.default_configuration(), expected)
 
@@ -60 +59 @@
         def mock_webkit_build_directory(arg_list):
             if arg_list == ['--top-level']:
-                return '/WebKitBuild/'
+                return '/WebKitBuild'
             elif arg_list == ['--configuration', '--debug']:
                 return '/WebKitBuild/Debug'
             elif arg_list == ['--configuration', '--release']:
                 return '/WebKitBuild/Release'
-            elif arg_list == []:
-                return '/WebKitBuild/\n/WebKitBuild//Debug\n'
             return 'Error'
 
@@ -75 +72 @@
 
         c = self.make_config(run_command_fn=mock_run_command)
-        self.assertEqual(c.build_directory(None), '/WebKitBuild/')
+        self.assertTrue(c.build_directory(None).endswith('WebKitBuild'))
 
         # Test again to check caching
-        self.assertEqual(c.build_directory(None), '/WebKitBuild/')
+        self.assertTrue(c.build_directory(None).endswith('WebKitBuild'))
 
         # Test other values
@@ -99 +96 @@
     def test_default_configuration__notfound(self):
         # This tests what happens if the default configuration file doesn't exist.
-        c = self.make_config(output='foo\nfoo/Release', files={'foo/Configuration': None})
+        c = self.make_config(output='foo', files={'foo/Configuration': None})
         self.assertEqual(c.default_configuration(), "Release")
 

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

@@ -381 +381 @@
         if not build_directory:
             build_directory = self._config.build_directory(self.get_option('configuration'))
-            # Set --root here Since this modifies the options object used by the worker subprocesses,
-            # it avoids the slow call out to build_directory in each subprocess.
-            self.set_option_default('root', build_directory)
         return self._filesystem.join(build_directory, *comps)