Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
index 7298eac5c0e55163b7ddb716c9d665f79f6d8d18..b7e31973c08fe276cd98c4d501f138f55975b310 100644 |
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/test.py |
@@ -36,6 +36,13 @@ from webkitpy.layout_tests.port.base import Port, VirtualTestSuite |
from webkitpy.layout_tests.port.driver import DeviceFailure, Driver, DriverOutput |
+# Here we use a non-standard location for the layout tests, to ensure that |
+# this works. The path contains a '.' in the name because we've seen bugs |
+# related to this before. |
+LAYOUT_TEST_DIR = '/test.checkout/LayoutTests' |
+PERF_TEST_DIR = '/test.checkout/PerformanceTests' |
+ |
+ |
# This sets basic expectations for a test. Each individual expectation |
# can be overridden by a keyword argument in TestList.add(). |
class TestInstance(object): |
@@ -259,22 +266,14 @@ layer at (0,0) size 800x34 |
return tests |
-# Here we use a non-standard location for the layout tests, to ensure that |
-# this works. The path contains a '.' in the name because we've seen bugs |
-# related to this before. |
- |
-LAYOUT_TEST_DIR = '/test.checkout/LayoutTests' |
-PERF_TEST_DIR = '/test.checkout/PerformanceTests' |
- |
- |
# Here we synthesize an in-memory filesystem from the test list |
# in order to fully control the test output and to demonstrate that |
# we don't need a real filesystem to run the tests. |
def add_unit_tests_to_mock_filesystem(filesystem): |
# Add the test_expectations file. |
- filesystem.maybe_make_directory('/mock-checkout/LayoutTests') |
- if not filesystem.exists('/mock-checkout/LayoutTests/TestExpectations'): |
- filesystem.write_text_file('/mock-checkout/LayoutTests/TestExpectations', """ |
+ filesystem.maybe_make_directory(LAYOUT_TEST_DIR) |
+ if not filesystem.exists(LAYOUT_TEST_DIR + '/TestExpectations'): |
+ filesystem.write_text_file(LAYOUT_TEST_DIR + '/TestExpectations', """ |
Bug(test) failures/expected/crash.html [ Crash ] |
Bug(test) failures/expected/crash_then_text.html [ Failure ] |
Bug(test) failures/expected/image.html [ Failure ] |
@@ -380,7 +379,7 @@ class TestPort(Port): |
# test ports. rebaseline_unittest.py needs to not mix both "real" ports |
# and "test" ports |
- self._generic_expectations_path = '/mock-checkout/LayoutTests/TestExpectations' |
+ self._generic_expectations_path = LAYOUT_TEST_DIR + '/TestExpectations' |
self._results_directory = None |
self._operating_system = 'mac' |