Move webkitpy.layout_tests.port to webkitpy.port

https://bugs.webkit.org/show_bug.cgi?id=114668

Reviewed by Maciej Stachowiak.

Moved. Port objects knows a lot more than just layout_tests. They doesn't belong down in layout_tests.

* Scripts/webkitpy/common/host.py:
* Scripts/webkitpy/common/host_mock.py:
* Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
* Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py:
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
* Scripts/webkitpy/layout_tests/lint_test_expectations.py:
* Scripts/webkitpy/layout_tests/port: Removed.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
* Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
* Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py:
* Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
* Scripts/webkitpy/performance_tests/perftest.py:
* Scripts/webkitpy/performance_tests/perftest_unittest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
* Scripts/webkitpy/port: Copied from Tools/Scripts/webkitpy/layout_tests/port.
* Scripts/webkitpy/port/apple.py:
* Scripts/webkitpy/port/base.py:
* Scripts/webkitpy/port/base_unittest.py:
* Scripts/webkitpy/port/config_unittest.py:
(ConfigTest.test_default_configuration__standalone):
* Scripts/webkitpy/port/driver_unittest.py:
* Scripts/webkitpy/port/efl.py:
* Scripts/webkitpy/port/efl_unittest.py:
* Scripts/webkitpy/port/factory.py:
* Scripts/webkitpy/port/factory_unittest.py:
* Scripts/webkitpy/port/gtk.py:
* Scripts/webkitpy/port/gtk_unittest.py:
* Scripts/webkitpy/port/image_diff.py:
* Scripts/webkitpy/port/image_diff_unittest.py:
* Scripts/webkitpy/port/leakdetector_unittest.py:
* Scripts/webkitpy/port/mac.py:
* Scripts/webkitpy/port/mac_unittest.py:
* Scripts/webkitpy/port/mock_drt.py:
* Scripts/webkitpy/port/mock_drt_unittest.py:
* Scripts/webkitpy/port/port_testcase.py:
* Scripts/webkitpy/port/qt.py:
* Scripts/webkitpy/port/qt_unittest.py:
* Scripts/webkitpy/port/server_process_unittest.py:
* Scripts/webkitpy/port/test.py:
* Scripts/webkitpy/port/win.py:
* Scripts/webkitpy/port/win_unittest.py:
* Scripts/webkitpy/port/xvfbdriver.py:
* Scripts/webkitpy/port/xvfbdriver_unittest.py:
* Scripts/webkitpy/tool/bot/botinfo_unittest.py:
* Scripts/webkitpy/tool/commands/gardenomatic.py:
* Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
* Scripts/webkitpy/tool/commands/queries.py:
* Scripts/webkitpy/tool/commands/queries_unittest.py:
* Scripts/webkitpy/tool/commands/rebaseline.py:
* Scripts/webkitpy/tool/servers/gardeningserver.py:
* Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
* Scripts/webkitpy/tool/servers/rebaselineserver.py:
* Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@148502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c350a019a5781d73e43389cc4dd8c2a018b064e5..abdbc013892d1db60a3d20fce7ed4f232fdc78d7 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,70 @@
+2013-04-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Move webkitpy.layout_tests.port to webkitpy.port
+        https://bugs.webkit.org/show_bug.cgi?id=114668
+
+        Reviewed by Maciej Stachowiak.
+
+        Moved. Port objects knows a lot more than just layout_tests. They doesn't belong down in layout_tests.
+
+        * Scripts/webkitpy/common/host.py:
+        * Scripts/webkitpy/common/host_mock.py:
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
+        * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+        * Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py:
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
+        * Scripts/webkitpy/layout_tests/lint_test_expectations.py:
+        * Scripts/webkitpy/layout_tests/port: Removed.
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        * Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py:
+        * Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py:
+        * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
+        * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+        * Scripts/webkitpy/performance_tests/perftest.py:
+        * Scripts/webkitpy/performance_tests/perftest_unittest.py:
+        * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        * Scripts/webkitpy/port: Copied from Tools/Scripts/webkitpy/layout_tests/port.
+        * Scripts/webkitpy/port/apple.py:
+        * Scripts/webkitpy/port/base.py:
+        * Scripts/webkitpy/port/base_unittest.py:
+        * Scripts/webkitpy/port/config_unittest.py:
+        (ConfigTest.test_default_configuration__standalone):
+        * Scripts/webkitpy/port/driver_unittest.py:
+        * Scripts/webkitpy/port/efl.py:
+        * Scripts/webkitpy/port/efl_unittest.py:
+        * Scripts/webkitpy/port/factory.py:
+        * Scripts/webkitpy/port/factory_unittest.py:
+        * Scripts/webkitpy/port/gtk.py:
+        * Scripts/webkitpy/port/gtk_unittest.py:
+        * Scripts/webkitpy/port/image_diff.py:
+        * Scripts/webkitpy/port/image_diff_unittest.py:
+        * Scripts/webkitpy/port/leakdetector_unittest.py:
+        * Scripts/webkitpy/port/mac.py:
+        * Scripts/webkitpy/port/mac_unittest.py:
+        * Scripts/webkitpy/port/mock_drt.py:
+        * Scripts/webkitpy/port/mock_drt_unittest.py:
+        * Scripts/webkitpy/port/port_testcase.py:
+        * Scripts/webkitpy/port/qt.py:
+        * Scripts/webkitpy/port/qt_unittest.py:
+        * Scripts/webkitpy/port/server_process_unittest.py:
+        * Scripts/webkitpy/port/test.py:
+        * Scripts/webkitpy/port/win.py:
+        * Scripts/webkitpy/port/win_unittest.py:
+        * Scripts/webkitpy/port/xvfbdriver.py:
+        * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+        * Scripts/webkitpy/tool/bot/botinfo_unittest.py:
+        * Scripts/webkitpy/tool/commands/gardenomatic.py:
+        * Scripts/webkitpy/tool/commands/perfalizer_unittest.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+        * Scripts/webkitpy/tool/commands/queries_unittest.py:
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+        * Scripts/webkitpy/tool/servers/rebaselineserver.py:
+        * Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py:
+
 2013-04-16  Commit Queue  <rniwa@webkit.org>
 
         Unreviewed, rolling out r148498.

diff --git a/Tools/Scripts/webkitpy/common/host.py b/Tools/Scripts/webkitpy/common/host.py
index ef4b7ef8366c9660b84d4995ee65fec3b0288015..022c13bf8f45bbc2bf52bfeb55b27da284850e8a 100644 (file)
--- a/Tools/Scripts/webkitpy/common/host.py
+++ b/Tools/Scripts/webkitpy/common/host.py
@@ -37,7 +37,7 @@ from webkitpy.common.memoized import memoized
 from webkitpy.common.net import bugzilla, buildbot, web
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.watchlist.watchlistparser import WatchListParser
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port.factory import PortFactory
 
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/common/host_mock.py b/Tools/Scripts/webkitpy/common/host_mock.py
index 8ac2dd3d2e15c465c12b942fe41d993b91eef511..be238463d10ec7ad040e55941a5720bae75d1621 100644 (file)
--- a/Tools/Scripts/webkitpy/common/host_mock.py
+++ b/Tools/Scripts/webkitpy/common/host_mock.py
@@ -35,8 +35,8 @@ from webkitpy.common.system.systemhost_mock import MockSystemHost
 from webkitpy.common.watchlist.watchlist_mock import MockWatchList
 
 # New-style ports need to move down into webkitpy.common.
-from webkitpy.layout_tests.port.factory import PortFactory
-from webkitpy.layout_tests.port.test import add_unit_tests_to_mock_filesystem
+from webkitpy.port.factory import PortFactory
+from webkitpy.port.test import add_unit_tests_to_mock_filesystem
 
 
 class MockHost(MockSystemHost):

diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py b/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
index 362747de4cc8111c743897b4dc59711368c61216..5613c825499cfca6e4fd6901995d2d5d68cc1108 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py
@@ -38,7 +38,7 @@ from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_run_results import TestRunResults
 from webkitpy.layout_tests.models.test_input import TestInput
 from webkitpy.layout_tests.models.test_results import TestResult
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 
 
 TestExpectations = test_expectations.TestExpectations

diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
index b794d31d70be1003d4e06d78e70a16ca9e44fd5c..53f25ce3be431dbe11307ff379e67ec3b257f27e 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
@@ -32,7 +32,7 @@ import re
 import time
 
 from webkitpy.layout_tests.controllers import test_result_writer
-from webkitpy.layout_tests.port.driver import DriverInput, DriverOutput
+from webkitpy.port.driver import DriverInput, DriverOutput
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_results import TestResult

diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py b/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py
index 313e8f07812fc493f9308bb62a177c9c9eea5f61..f484da55ead2fdffb1c3d75718cf1ed65fbe137c 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer_unittest.py
@@ -28,8 +28,8 @@ import unittest2 as unittest
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.controllers import test_result_writer
 from webkitpy.layout_tests.models import test_failures
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestPort
 
 
 class TestResultWriterTest(unittest.TestCase):

diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
index 14270027d87192d3860e87dc47c6f65d0d6ecc0c..c952e33bcfb0d90001a7561f1b76f3be2f401e99 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
@@ -34,7 +34,7 @@ import random
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.layout_package import json_results_generator
 from webkitpy.layout_tests.models import test_expectations
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.thirdparty.mock import Mock
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py b/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
index 52aa7b99fe8def7efc6a2f449edb58580f3fec60..90e4cbb51a74a812c609100a20a748d63bf1bbf2 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
+++ b/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations.py
@@ -33,7 +33,7 @@ import traceback
 
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.models import test_expectations
-from webkitpy.layout_tests.port import platform_options
+from webkitpy.port import platform_options
 
 
 # This mirrors what the shell normally does.

diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
index b211b97f28b3427cb22769b10c04d2c6ded10dfb..74cb69b613d2ea685a3bafcebde033bfac431052 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
@@ -37,7 +37,7 @@ import traceback
 
 from webkitpy.common.host import Host
 from webkitpy.layout_tests.controllers.manager import Manager
-from webkitpy.layout_tests.port import configuration_options, platform_options
+from webkitpy.port import configuration_options, platform_options
 from webkitpy.layout_tests.views import buildbot_results
 from webkitpy.layout_tests.views import printing
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
index bd45ab32a2d53232e1e9c7a5c2532cc44863b1bf..74f1e29a8a0b428266c71c25f3896ef81bd2be65 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py
@@ -48,10 +48,10 @@ from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.host import Host
 from webkitpy.common.host_mock import MockHost
 
-from webkitpy.layout_tests import port
+from webkitpy import port
 from webkitpy.layout_tests import run_webkit_tests
-from webkitpy.layout_tests.port import Port
-from webkitpy.layout_tests.port import test
+from webkitpy.port import Port
+from webkitpy.port import test
 from webkitpy.test.skip import skip_if
 from webkitpy.tool.mocktool import MockOptions
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
index 5ca027f23cdd997dfee483034ff8a4aa0e9c4dce..5b4ffa79a031da530ebd89a2a9d98b0d9da424da 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server_unittest.py
@@ -33,7 +33,7 @@ import unittest2 as unittest
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.apache_http_server import LayoutTestApacheHttpd
 from webkitpy.layout_tests.servers.http_server_base import ServerError
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py
index 410f6e44f45861078a9dd775ad40b2ebae4b9610..2cf1d2cf0afd56a5151b850be719ad75ae949448 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base_unittest.py
@@ -29,7 +29,7 @@
 import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.http_server_base import HttpServerBase
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py b/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
index 2ee949596aa3996b4bc97f711888b86a3ff77115..621838f00ec9703db5056439378a5f881a4229d5 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
@@ -31,7 +31,7 @@ import sys
 import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
-from webkitpy.layout_tests.port import test
+from webkitpy.port import test
 from webkitpy.layout_tests.servers.http_server import Lighttpd
 from webkitpy.layout_tests.servers.http_server_base import ServerError
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py b/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
index 71e7888170a82504a3e8efa3c88042cba88a9bad..d65cc5e12d45435c716524753bb8c7cb6fd2a947 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py
@@ -37,7 +37,7 @@ import unittest2 as unittest
 from webkitpy.common.host_mock import MockHost
 
 from webkitpy.common.system import logtesting
-from webkitpy.layout_tests import port
+from webkitpy import port
 from webkitpy.layout_tests.controllers import manager
 from webkitpy.layout_tests.models import test_expectations
 from webkitpy.layout_tests.models import test_failures

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest.py b/Tools/Scripts/webkitpy/performance_tests/perftest.py
index 29a796f4af0f8f0740c4550f9729f1fad62b8571..2c365c364336e882c9ed17d1a673c5cec3ca1d19 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest.py
@@ -45,8 +45,8 @@ if sys.platform not in ('cygwin', 'win32'):
     import webkitpy.thirdparty.autoinstalled.webpagereplay.replay
 
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
-from webkitpy.layout_tests.port.driver import DriverInput
-from webkitpy.layout_tests.port.driver import DriverOutput
+from webkitpy.port.driver import DriverInput
+from webkitpy.port.driver import DriverOutput
 
 DEFAULT_TEST_RUNNER_COUNT = 4
 

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
index 8b299b8d0bc5575718c4c0a485de00940de0f15d..010a3007c47481fccdbbf44f4675a01bdb1f358f 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftest_unittest.py
@@ -33,9 +33,9 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestDriver
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestDriver
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import ChromiumStylePerfTest
 from webkitpy.performance_tests.perftest import PerfTest
 from webkitpy.performance_tests.perftest import PerfTestMetric

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py b/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py
index 8bc2148e4cc49a16f249bf3f91c0c0cecf54bd34..3f9625d9c2500bbbffe45fba3d99b5db1ae151c3 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py
@@ -36,8 +36,8 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.driver import DriverOutput
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.driver import DriverOutput
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import ChromiumStylePerfTest
 from webkitpy.performance_tests.perftest import PerfTest
 from webkitpy.performance_tests.perftestsrunner import PerfTestsRunner

diff --git a/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py b/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
index 4e38f530d4191fc907010ee8b9dfb155a10bc434..29bd7a8b1a6c73286222b7fa9e5e1af6e8e4ea23 100644 (file)
--- a/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
+++ b/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
@@ -35,7 +35,7 @@ import unittest2 as unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.performance_tests.perftest import DEFAULT_TEST_RUNNER_COUNT
 from webkitpy.performance_tests.perftestsrunner import PerfTestsRunner
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/__init__.py b/Tools/Scripts/webkitpy/port/__init__.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/__init__.py
rename to Tools/Scripts/webkitpy/port/__init__.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/apple.py b/Tools/Scripts/webkitpy/port/apple.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/apple.py
rename to Tools/Scripts/webkitpy/port/apple.py
index 9290bca9107b9c6c4018b39f51814e033f729220..966d04a9d692f86e3132591739633db3710232c6 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/apple.py
+++ b/Tools/Scripts/webkitpy/port/apple.py
@@ -28,7 +28,7 @@
 
 import logging
 
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base.py b/Tools/Scripts/webkitpy/port/base.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/base.py
rename to Tools/Scripts/webkitpy/port/base.py
index 9ddbded395814c4c3f212d994f1b20d00fa76cd3..c6ec76fc9d8ba48ed6fe878e7815030cdc952b41 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/Tools/Scripts/webkitpy/port/base.py
@@ -55,12 +55,12 @@ from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port import config as port_config
-from webkitpy.layout_tests.port import driver
-from webkitpy.layout_tests.port import http_lock
-from webkitpy.layout_tests.port import image_diff
-from webkitpy.layout_tests.port import server_process
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port import config as port_config
+from webkitpy.port import driver
+from webkitpy.port import http_lock
+from webkitpy.port import image_diff
+from webkitpy.port import server_process
+from webkitpy.port.factory import PortFactory
 from webkitpy.layout_tests.servers import apache_http_server
 from webkitpy.layout_tests.servers import http_server
 from webkitpy.layout_tests.servers import websocket_server
@@ -68,7 +68,6 @@ from webkitpy.layout_tests.servers import websocket_server
 _log = logging.getLogger(__name__)
 
 
-# FIXME: This class should merge with WebKitPort now that Chromium behaves mostly like other webkit ports.
 class Port(object):
     """Abstract class for Port-specific hooks for the layout_test package."""
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py b/Tools/Scripts/webkitpy/port/base_unittest.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
rename to Tools/Scripts/webkitpy/port/base_unittest.py
index 76856954531c33cc5c66283c4266d85f23297a29..53aa90271ca0407a778da817abf9b85fce223859 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py
+++ b/Tools/Scripts/webkitpy/port/base_unittest.py
@@ -42,8 +42,8 @@ from webkitpy.tool.mocktool import MockOptions
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.test import add_unit_tests_to_mock_filesystem, TestPort
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
 
 class PortTest(unittest.TestCase):
     def make_port(self, executive=None, with_tests=False, port_name=None, **kwargs):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders.py b/Tools/Scripts/webkitpy/port/builders.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/builders.py
rename to Tools/Scripts/webkitpy/port/builders.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/builders_unittest.py b/Tools/Scripts/webkitpy/port/builders_unittest.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/builders_unittest.py
rename to Tools/Scripts/webkitpy/port/builders_unittest.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/config.py b/Tools/Scripts/webkitpy/port/config.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/config.py
rename to Tools/Scripts/webkitpy/port/config.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/config_standalone.py b/Tools/Scripts/webkitpy/port/config_standalone.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/config_standalone.py
rename to Tools/Scripts/webkitpy/port/config_standalone.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py b/Tools/Scripts/webkitpy/port/config_unittest.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py
rename to Tools/Scripts/webkitpy/port/config_unittest.py
index 27c83eedc751eb9622b920f738701b53218d7007..4015d5b61a9cfd99fb04026b657a32ce417202d1 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/config_unittest.py
+++ b/Tools/Scripts/webkitpy/port/config_unittest.py
@@ -132,7 +132,7 @@ class ConfigTest(unittest.TestCase):
         e = Executive()
         fs = FileSystem()
         c = config.Config(e, fs)
-        script = WebKitFinder(fs).path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'layout_tests', 'port', 'config_standalone.py')
+        script = WebKitFinder(fs).path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'port', 'config_standalone.py')
 
         # Note: don't use 'Release' here, since that's the normal default.
         expected = 'Debug'

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver.py b/Tools/Scripts/webkitpy/port/driver.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/driver.py
rename to Tools/Scripts/webkitpy/port/driver.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py b/Tools/Scripts/webkitpy/port/driver_unittest.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
rename to Tools/Scripts/webkitpy/port/driver_unittest.py
index 32173a8817ffb2d6655b7e8622af28f5b7413133..adfdc634482227d074436a2c53a748cf5d7ffe6d 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/driver_unittest.py
+++ b/Tools/Scripts/webkitpy/port/driver_unittest.py
@@ -30,11 +30,11 @@ import unittest2 as unittest
 
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.server_process_mock import MockServerProcess
 
 # FIXME: remove the dependency on TestWebKitPort
-from webkitpy.layout_tests.port.port_testcase import TestWebKitPort
+from webkitpy.port.port_testcase import TestWebKitPort
 
 from webkitpy.tool.mocktool import MockOptions
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/efl.py b/Tools/Scripts/webkitpy/port/efl.py
similarity index 96%
rename from Tools/Scripts/webkitpy/layout_tests/port/efl.py
rename to Tools/Scripts/webkitpy/port/efl.py
index 08966340344ee6dc8906b3a31f3164e3ad543f89..01c66eba894fac29308ee6e8854eafd9f3e9ac76 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/efl.py
+++ b/Tools/Scripts/webkitpy/port/efl.py
@@ -30,9 +30,9 @@
 import os
 
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 
 class EflPort(Port):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py b/Tools/Scripts/webkitpy/port/efl_unittest.py
similarity index 92%
rename from Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py
rename to Tools/Scripts/webkitpy/port/efl_unittest.py
index 503afda293d24948bc79db4a9f0757bb480afe5f..a16dbaf5748dbd7375823337d40c1d755a784a1b 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/efl_unittest.py
+++ b/Tools/Scripts/webkitpy/port/efl_unittest.py
@@ -28,9 +28,9 @@ import unittest2 as unittest
 
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.efl import EflPort
-from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.efl import EflPort
+from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
+from webkitpy.port import port_testcase
 
 
 class EflPortTest(port_testcase.PortTestCase):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/factory.py b/Tools/Scripts/webkitpy/port/factory.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/factory.py
rename to Tools/Scripts/webkitpy/port/factory.py
index 41944b2a4be72f73ffe294cd62b36369fbd40484..e9f1465630077c2d1d764e29ba464a53bc41e66e 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/factory.py
+++ b/Tools/Scripts/webkitpy/port/factory.py
@@ -32,7 +32,7 @@ import fnmatch
 import optparse
 import re
 
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 
 
 def platform_options(use_globs=False):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py b/Tools/Scripts/webkitpy/port/factory_unittest.py
similarity index 93%
rename from Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
rename to Tools/Scripts/webkitpy/port/factory_unittest.py
index 0642f3a5bc44394b69069183e7757fcd8a4058b8..6f09a2eb9bde1c1968037f601c07f157859003da 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.py
+++ b/Tools/Scripts/webkitpy/port/factory_unittest.py
@@ -31,12 +31,12 @@ import unittest2 as unittest
 from webkitpy.tool.mocktool import MockOptions
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import factory
-from webkitpy.layout_tests.port import gtk
-from webkitpy.layout_tests.port import mac
-from webkitpy.layout_tests.port import qt
-from webkitpy.layout_tests.port import test
-from webkitpy.layout_tests.port import win
+from webkitpy.port import factory
+from webkitpy.port import gtk
+from webkitpy.port import mac
+from webkitpy.port import qt
+from webkitpy.port import test
+from webkitpy.port import win
 
 
 class FactoryTest(unittest.TestCase):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/gtk.py b/Tools/Scripts/webkitpy/port/gtk.py
similarity index 97%
rename from Tools/Scripts/webkitpy/layout_tests/port/gtk.py
rename to Tools/Scripts/webkitpy/port/gtk.py
index a023806543acd7f6960d2211c10a191d79c19666..c94f036ed0590da9186d3640831f6b2fe853a1f1 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/gtk.py
+++ b/Tools/Scripts/webkitpy/port/gtk.py
@@ -30,9 +30,9 @@ import os
 import subprocess
 
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.pulseaudio_sanitizer import PulseAudioSanitizer
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 
 class GtkPort(Port):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py b/Tools/Scripts/webkitpy/port/gtk_unittest.py
similarity index 96%
rename from Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py
rename to Tools/Scripts/webkitpy/port/gtk_unittest.py
index 7d24bb3bc45ece129b257da6065dbc427b2a8933..e806091bb81ff9840844550a1544e9c399732f46 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/gtk_unittest.py
+++ b/Tools/Scripts/webkitpy/port/gtk_unittest.py
@@ -33,9 +33,9 @@ import os
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.gtk import GtkPort
-from webkitpy.layout_tests.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.gtk import GtkPort
+from webkitpy.port.pulseaudio_sanitizer_mock import PulseAudioSanitizerMock
+from webkitpy.port import port_testcase
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.mocktool import MockOptions
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/http_lock.py b/Tools/Scripts/webkitpy/port/http_lock.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/http_lock.py
rename to Tools/Scripts/webkitpy/port/http_lock.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/http_lock_unittest.py b/Tools/Scripts/webkitpy/port/http_lock_unittest.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/http_lock_unittest.py
rename to Tools/Scripts/webkitpy/port/http_lock_unittest.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/image_diff.py b/Tools/Scripts/webkitpy/port/image_diff.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/image_diff.py
rename to Tools/Scripts/webkitpy/port/image_diff.py
index 25feaba80bfaef5396169c52fd54661b498c0de3..4f1b059b44d5e8ef65ee30d2f74c48c2bc9ac200 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/image_diff.py
+++ b/Tools/Scripts/webkitpy/port/image_diff.py
@@ -34,7 +34,7 @@ import logging
 import re
 import time
 
-from webkitpy.layout_tests.port import server_process
+from webkitpy.port import server_process
 
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py b/Tools/Scripts/webkitpy/port/image_diff_unittest.py
similarity index 94%
rename from Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py
rename to Tools/Scripts/webkitpy/port/image_diff_unittest.py
index b5b427b72ca0324ac4fd333490a7d5ce8b6cd550..c06192eb03ca543397f43d10300b3ec9b01b0954 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/image_diff_unittest.py
+++ b/Tools/Scripts/webkitpy/port/image_diff_unittest.py
@@ -30,8 +30,8 @@
 
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
-from webkitpy.layout_tests.port.image_diff import ImageDiffer
+from webkitpy.port.server_process_mock import MockServerProcess
+from webkitpy.port.image_diff import ImageDiffer
 
 
 class FakePort(object):

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/leakdetector.py b/Tools/Scripts/webkitpy/port/leakdetector.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/leakdetector.py
rename to Tools/Scripts/webkitpy/port/leakdetector.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py b/Tools/Scripts/webkitpy/port/leakdetector_unittest.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py
rename to Tools/Scripts/webkitpy/port/leakdetector_unittest.py
index f2daec937e9b0ac8935bd9bb3164acebd28ac2af..d81f2b21165ff5a8af170f567ed89d9acffa89f8 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py
+++ b/Tools/Scripts/webkitpy/port/leakdetector_unittest.py
@@ -28,7 +28,7 @@
 
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.leakdetector import LeakDetector
+from webkitpy.port.leakdetector import LeakDetector
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.executive_mock import MockExecutive

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mac.py b/Tools/Scripts/webkitpy/port/mac.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/mac.py
rename to Tools/Scripts/webkitpy/port/mac.py
index d39ba35004e773a32753961473e5515643ce2791..d66e6d6faff0dd4b8b2e30a3b6e7b6f35eb4bba2 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/Tools/Scripts/webkitpy/port/mac.py
@@ -33,8 +33,8 @@ import time
 
 from webkitpy.common.system.crashlogs import CrashLogs
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.layout_tests.port.apple import ApplePort
-from webkitpy.layout_tests.port.leakdetector import LeakDetector
+from webkitpy.port.apple import ApplePort
+from webkitpy.port.leakdetector import LeakDetector
 
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py b/Tools/Scripts/webkitpy/port/mac_unittest.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
rename to Tools/Scripts/webkitpy/port/mac_unittest.py
index 3faf9c154d117f21de2ac86d3c57ec0b921b0f45..cdbd894d387ed351502f267e4d7ce15dd23029b1 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py
+++ b/Tools/Scripts/webkitpy/port/mac_unittest.py
@@ -26,8 +26,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from webkitpy.layout_tests.port.mac import MacPort
-from webkitpy.layout_tests.port import port_testcase
+from webkitpy.port.mac import MacPort
+from webkitpy.port import port_testcase
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.tool.mocktool import MockOptions

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py b/Tools/Scripts/webkitpy/port/mock_drt.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
rename to Tools/Scripts/webkitpy/port/mock_drt.py
index 50a9a20ee654b07aa45839d447f2529659755837..00591f13aedfc261ee60fdaa80cf6ee6e1ed92ee 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt.py
+++ b/Tools/Scripts/webkitpy/port/mock_drt.py
@@ -49,8 +49,8 @@ if script_dir not in sys.path:
     sys.path.append(script_dir)
 
 from webkitpy.common.system.systemhost import SystemHost
-from webkitpy.layout_tests.port.driver import DriverInput, DriverOutput, DriverProxy
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port.driver import DriverInput, DriverOutput, DriverProxy
+from webkitpy.port.factory import PortFactory
 
 _log = logging.getLogger(__name__)
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py b/Tools/Scripts/webkitpy/port/mock_drt_unittest.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
rename to Tools/Scripts/webkitpy/port/mock_drt_unittest.py
index bd285efc7680414f83e2764c19ac4f0b3b7c0a24..46ee57bccec5c1db91998733db455b8bbf03e463 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
+++ b/Tools/Scripts/webkitpy/port/mock_drt_unittest.py
@@ -33,10 +33,10 @@ import unittest2 as unittest
 
 from webkitpy.common import newstringio
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import mock_drt
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port import test
-from webkitpy.layout_tests.port.factory import PortFactory
+from webkitpy.port import mock_drt
+from webkitpy.port import port_testcase
+from webkitpy.port import test
+from webkitpy.port.factory import PortFactory
 from webkitpy.tool import mocktool
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py b/Tools/Scripts/webkitpy/port/port_testcase.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
rename to Tools/Scripts/webkitpy/port/port_testcase.py
index df480d4462d5a6204edc04636f219ec62fbb95d1..98758e8a820dbb85323e4419423906b513e989d5 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
+++ b/Tools/Scripts/webkitpy/port/port_testcase.py
@@ -40,8 +40,8 @@ from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
+from webkitpy.port.base import Port
+from webkitpy.port.server_process_mock import MockServerProcess
 from webkitpy.layout_tests.servers import http_server_base
 from webkitpy.tool.mocktool import MockOptions
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer.py b/Tools/Scripts/webkitpy/port/pulseaudio_sanitizer.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer.py
rename to Tools/Scripts/webkitpy/port/pulseaudio_sanitizer.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py b/Tools/Scripts/webkitpy/port/pulseaudio_sanitizer_mock.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/pulseaudio_sanitizer_mock.py
rename to Tools/Scripts/webkitpy/port/pulseaudio_sanitizer_mock.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/qt.py b/Tools/Scripts/webkitpy/port/qt.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/qt.py
rename to Tools/Scripts/webkitpy/port/qt.py
index 4840725e1ff2ffc7661ab8428393975b96608ec4..5dda762f468744e70cac145832d1360983a6d3e6 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/qt.py
+++ b/Tools/Scripts/webkitpy/port/qt.py
@@ -36,8 +36,8 @@ import os
 
 from webkitpy.common.memoized import memoized
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
-from webkitpy.layout_tests.port.base import Port
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port.base import Port
+from webkitpy.port.xvfbdriver import XvfbDriver
 
 _log = logging.getLogger(__name__)
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py b/Tools/Scripts/webkitpy/port/qt_unittest.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py
rename to Tools/Scripts/webkitpy/port/qt_unittest.py
index 2adfbc162d9a31aa8f163629ea83d81ef423c387..a0e7ceb2ddbb32e23a69fb71a635e932e7d2361d 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py
+++ b/Tools/Scripts/webkitpy/port/qt_unittest.py
@@ -33,8 +33,8 @@ from copy import deepcopy
 from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port.qt import QtPort
+from webkitpy.port import port_testcase
+from webkitpy.port.qt import QtPort
 from webkitpy.tool.mocktool import MockOptions
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/server_process.py b/Tools/Scripts/webkitpy/port/server_process.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/server_process.py
rename to Tools/Scripts/webkitpy/port/server_process.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/server_process_mock.py b/Tools/Scripts/webkitpy/port/server_process_mock.py
similarity index 100%
rename from Tools/Scripts/webkitpy/layout_tests/port/server_process_mock.py
rename to Tools/Scripts/webkitpy/port/server_process_mock.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/server_process_unittest.py b/Tools/Scripts/webkitpy/port/server_process_unittest.py
similarity index 97%
rename from Tools/Scripts/webkitpy/layout_tests/port/server_process_unittest.py
rename to Tools/Scripts/webkitpy/port/server_process_unittest.py
index 97376aaffc97460fbddfda8a8ad8797b89f92284..5ad7d0ea7e65f41e5fdc6bedb31ac61af26c8f41 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/server_process_unittest.py
+++ b/Tools/Scripts/webkitpy/port/server_process_unittest.py
@@ -30,8 +30,8 @@ import sys
 import time
 import unittest2 as unittest
 
-from webkitpy.layout_tests.port.factory import PortFactory
-from webkitpy.layout_tests.port import server_process
+from webkitpy.port.factory import PortFactory
+from webkitpy.port import server_process
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 from webkitpy.common.system.outputcapture import OutputCapture

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/test.py b/Tools/Scripts/webkitpy/port/test.py
similarity index 99%
rename from Tools/Scripts/webkitpy/layout_tests/port/test.py
rename to Tools/Scripts/webkitpy/port/test.py
index c622cc216b17c50a137e43c84ed6558942348a11..7ad318dbfc229aef37b14a13ed7a000aa19609d5 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/test.py
+++ b/Tools/Scripts/webkitpy/port/test.py
@@ -30,8 +30,8 @@ import base64
 import sys
 import time
 
-from webkitpy.layout_tests.port import Port, Driver, DriverOutput
-from webkitpy.layout_tests.port.base import VirtualTestSuite
+from webkitpy.port import Port, Driver, DriverOutput
+from webkitpy.port.base import VirtualTestSuite
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.crashlogs import CrashLogs

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/win.py b/Tools/Scripts/webkitpy/port/win.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/win.py
rename to Tools/Scripts/webkitpy/port/win.py
index 6adbf753d44a62d06bf36f3b9e4971f8c802e459..2bb54fdae51185e1f46284c0b7917f0b080e554e 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/win.py
+++ b/Tools/Scripts/webkitpy/port/win.py
@@ -33,7 +33,7 @@ import sys
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.system.executive import ScriptError, Executive
 from webkitpy.common.system.path import abspath_to_uri
-from webkitpy.layout_tests.port.apple import ApplePort
+from webkitpy.port.apple import ApplePort
 
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py b/Tools/Scripts/webkitpy/port/win_unittest.py
similarity index 98%
rename from Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
rename to Tools/Scripts/webkitpy/port/win_unittest.py
index e77687c02196cabd5c7514237a52e66522a979a2..a3ee96145a0fafa156b9eafcd7f7d18fb97e5722 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/win_unittest.py
+++ b/Tools/Scripts/webkitpy/port/win_unittest.py
@@ -34,8 +34,8 @@ from webkitpy.common.system.executive_mock import MockExecutive, MockExecutive2
 from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import port_testcase
-from webkitpy.layout_tests.port.win import WinPort
+from webkitpy.port import port_testcase
+from webkitpy.port.win import WinPort
 from webkitpy.tool.mocktool import MockOptions
 
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py b/Tools/Scripts/webkitpy/port/xvfbdriver.py
similarity index 97%
rename from Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py
rename to Tools/Scripts/webkitpy/port/xvfbdriver.py
index 71ea8ddb8626c2745388e5d9001637b500ef2245..fc6675029165b0471d03f8a38ec4fbcab92a838d 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py
+++ b/Tools/Scripts/webkitpy/port/xvfbdriver.py
@@ -31,8 +31,8 @@ import os
 import re
 import time
 
-from webkitpy.layout_tests.port.server_process import ServerProcess
-from webkitpy.layout_tests.port.driver import Driver
+from webkitpy.port.server_process import ServerProcess
+from webkitpy.port.driver import Driver
 from webkitpy.common.system.file_lock import FileLock
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py b/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py
similarity index 97%
rename from Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py
rename to Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py
index 4c5d33804584c46b3d4b56bdb3c25822da8576f8..ec9f14c45c211cad338cd6532803c2547e31b1f6 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py
+++ b/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py
@@ -33,9 +33,9 @@ from webkitpy.common.system.filesystem_mock import MockFileSystem
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
-from webkitpy.layout_tests.port import Port
-from webkitpy.layout_tests.port.server_process_mock import MockServerProcess
-from webkitpy.layout_tests.port.xvfbdriver import XvfbDriver
+from webkitpy.port import Port
+from webkitpy.port.server_process_mock import MockServerProcess
+from webkitpy.port.xvfbdriver import XvfbDriver
 from webkitpy.tool.mocktool import MockOptions
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/tool/bot/botinfo_unittest.py b/Tools/Scripts/webkitpy/tool/bot/botinfo_unittest.py
index 558955619cd3d2ab22bebdd0eaa2a610b12cbbb4..04861f452f378e3fc03f8612a82a12d723d44c1f 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/bot/botinfo_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/bot/botinfo_unittest.py
@@ -31,7 +31,7 @@ import unittest2 as unittest
 from webkitpy.tool.bot.botinfo import BotInfo
 from webkitpy.tool.mocktool import MockTool
 from webkitpy.common.net.statusserver_mock import MockStatusServer
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 
 
 class BotInfoTest(unittest.TestCase):

diff --git a/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py b/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py
index c87c1a2653fcdb2aa5c706919c1b007a5a4eaf70..e9762858d5a6680213b3e8b0ab019aeb22686cfa 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py
+++ b/Tools/Scripts/webkitpy/tool/commands/gardenomatic.py
@@ -22,7 +22,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 from webkitpy.tool.commands.rebaseline import AbstractRebaseliningCommand
 from webkitpy.tool.servers.gardeningserver import GardeningHTTPServer
 

diff --git a/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py b/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py
index 14211e40b463eff70bcad23bebf4c7257800bdfa..3efb4612901593467f70bf471b03a1dd72ce9b75 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/perfalizer_unittest.py
@@ -31,7 +31,7 @@ import unittest2 as unittest
 from webkitpy.common.net.buildbot import Builder
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.outputcapture import OutputCapture
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.tool.commands.perfalizer import PerfalizerTask
 from webkitpy.tool.mocktool import MockTool
 

diff --git a/Tools/Scripts/webkitpy/tool/commands/queries.py b/Tools/Scripts/webkitpy/tool/commands/queries.py
index cf1c47fb3205a22b00c4c61808cf0e45b87aa508..640f09d75b5bde73729868e2455dc547b4ef3038 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/queries.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queries.py
@@ -48,7 +48,7 @@ from webkitpy.tool.commands.abstractsequencedcommand import AbstractSequencedCom
 from webkitpy.tool.grammar import pluralize
 from webkitpy.tool.multicommandtool import Command
 from webkitpy.layout_tests.models.test_expectations import TestExpectations
-from webkitpy.layout_tests.port import platform_options, configuration_options
+from webkitpy.port import platform_options, configuration_options
 
 _log = logging.getLogger(__name__)
 

diff --git a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
index b94b0314eef417246ce3a7315c25f14d1eb14292..8800cac3b07b9bfc9a8d1e38a49287bbb2481e68 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py
@@ -33,7 +33,7 @@ from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.net.bugzilla import Bugzilla
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.thirdparty.mock import Mock
-from webkitpy.layout_tests.port.test import TestPort
+from webkitpy.port.test import TestPort
 from webkitpy.tool.commands.commandtest import CommandsTest
 from webkitpy.tool.commands.queries import *
 from webkitpy.tool.mocktool import MockTool, MockOptions

diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
index f15dc03e21e8220e0a1e2a5eb40df6184e73751f..06d42d097812dcd8eb73ddf6717ca23f63c67299 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
@@ -36,8 +36,8 @@ from webkitpy.common.system.executive import ScriptError
 from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
 from webkitpy.layout_tests.models import test_failures
 from webkitpy.layout_tests.models.test_expectations import TestExpectations, BASELINE_SUFFIX_LIST
-from webkitpy.layout_tests.port import builders
-from webkitpy.layout_tests.port import factory
+from webkitpy.port import builders
+from webkitpy.port import factory
 from webkitpy.tool.multicommandtool import Command
 
 

diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
index 6d29f445d8c3763d13dba13f346c03f8ac449533..b0698466059acbf2b2eb6a583e5f15c9fd0991e2 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py
@@ -32,7 +32,7 @@ import urllib
 
 from webkitpy.common.memoized import memoized
 from webkitpy.tool.servers.reflectionhandler import ReflectionHandler
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 
 
 _log = logging.getLogger(__name__)

diff --git a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
index 45bd4ee5bdfff36496ddecd1cb6aef433f73bf44..9f9efe80763360008a000a5e5e2b2fe203ea3aad 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py
@@ -32,7 +32,7 @@ import unittest2 as unittest
 
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.layout_tests.models.test_configuration import *
-from webkitpy.layout_tests.port import builders
+from webkitpy.port import builders
 from webkitpy.thirdparty.mock import Mock
 from webkitpy.tool.mocktool import MockTool
 from webkitpy.common.system.executive_mock import MockExecutive

diff --git a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
index 04ce5176c55f073657415190d8cd13280e121ca3..41a32ba5404dc6be15f002d5eecd0b589ebf6345 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
+++ b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver.py
@@ -33,7 +33,7 @@ import BaseHTTPServer
 
 from webkitpy.common.host import Host  # FIXME: This should not be needed!
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.tool.servers.reflectionhandler import ReflectionHandler
 
 

diff --git a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py
index fd19c4d4700b1a73325cf90545762a13aea2d766..721154cb65495629dc0b809aac67ca9329f5e7d6 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/servers/rebaselineserver_unittest.py
@@ -32,7 +32,7 @@ import unittest2 as unittest
 from webkitpy.common.net import resultsjsonparser_unittest
 from webkitpy.common.host_mock import MockHost
 from webkitpy.layout_tests.layout_package.json_results_generator import strip_json_wrapper
-from webkitpy.layout_tests.port.base import Port
+from webkitpy.port.base import Port
 from webkitpy.tool.commands.rebaselineserver import TestConfig, RebaselineServer
 from webkitpy.tool.servers import rebaselineserver