Changeset 155404 in webkit


Ignore:
Timestamp:
Sep 9, 2013, 5:23:17 PM (12 years ago)
Author:
mark.lam@apple.com
Message:

Tools: Rolling out r155392 (Point Tools scripts to LayoutTests/resources): breaks tests.
​https://bugs.webkit.org/show_bug.cgi?id=120899.

Not reviewed.

  • Scripts/make-new-script-test:

(makePathToSharedSources):

  • Scripts/run-fast-jsc:
  • Scripts/webkitperl/httpd.pm:

(getDefaultConfigForTestDirectory):

  • Scripts/webkitpy/layout_tests/servers/apache_http_server.py:

(LayoutTestApacheHttpd.init):

  • Scripts/webkitpy/layout_tests/servers/http_server.py:

(Lighttpd.init):

  • Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py:

(BaseTest.integration_test_port_and_root):

  • Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:

(TestHttpServer.test_start_cmd):

  • Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py:

(translate_includes):

  • Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests_unittest.py:

(TestTranslation.test_include_rewriting):

LayoutTests: Rolling out r155392(Remove old fast/js/resources pre and post test files): breaks tests.
​https://bugs.webkit.org/show_bug.cgi?id=120899.

Not reviewed.

  • fast/js/resources/js-test-post-async.js: Copied from LayoutTests/fast/js/resources/js-test-post-async.js.
  • fast/js/resources/js-test-post.js: Copied from LayoutTests/fast/js/resources/js-test-post.js.
  • fast/js/resources/js-test-pre.js: Copied from LayoutTests/fast/js/resources/js-test-pre.js.
  • fast/js/resources/standalone-post.js: Copied from LayoutTests/fast/js/resources/standalone-post.js.
  • fast/js/resources/standalone-pre.js: Copied from LayoutTests/fast/js/resources/standalone-pre.js.
Location:
trunk
Files:
11 edited
5 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r155401 r155404  
     12013-09-09  Mark Lam  <mark.lam@apple.com>
     2
     3        Rolling out r155392(Remove old fast/js/resources pre and post test files): breaks tests.
     4        https://bugs.webkit.org/show_bug.cgi?id=120899.
     5
     6        Not reviewed.
     7
     8        * fast/js/resources/js-test-post-async.js: Copied from LayoutTests/fast/js/resources/js-test-post-async.js.
     9        * fast/js/resources/js-test-post.js: Copied from LayoutTests/fast/js/resources/js-test-post.js.
     10        * fast/js/resources/js-test-pre.js: Copied from LayoutTests/fast/js/resources/js-test-pre.js.
     11        * fast/js/resources/standalone-post.js: Copied from LayoutTests/fast/js/resources/standalone-post.js.
     12        * fast/js/resources/standalone-pre.js: Copied from LayoutTests/fast/js/resources/standalone-pre.js.
     13
    1142013-09-09  Mark Lam  <mark.lam@apple.com>
    215

  • trunk/Tools/ChangeLog

    r155392 r155404  
     12013-09-09  Mark Lam  <mark.lam@apple.com>
     2
     3        Rolling out r155392 (Point Tools scripts to LayoutTests/resources): breaks tests.
     4        https://bugs.webkit.org/show_bug.cgi?id=120899.
     5
     6        Not reviewed.
     7
     8        * Scripts/make-new-script-test:
     9        (makePathToSharedSources):
     10        * Scripts/run-fast-jsc:
     11        * Scripts/webkitperl/httpd.pm:
     12        (getDefaultConfigForTestDirectory):
     13        * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
     14        (LayoutTestApacheHttpd.__init__):
     15        * Scripts/webkitpy/layout_tests/servers/http_server.py:
     16        (Lighttpd.__init__):
     17        * Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py:
     18        (BaseTest.integration_test_port_and_root):
     19        * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
     20        (TestHttpServer.test_start_cmd):
     21        * Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py:
     22        (translate_includes):
     23        * Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests_unittest.py:
     24        (TestTranslation.test_include_rewriting):
     25
    1262013-09-09  Mark Lam  <mark.lam@apple.com>
    227

  • trunk/Tools/Scripts/make-new-script-test

    r155392 r155404  
    8181        return "/js-test-resources";
    8282    } else {
    83         return File::Spec->abs2rel("resources/", dirname($testAbsolutePath));
     83        return File::Spec->abs2rel("fast/js/resources/", dirname($testAbsolutePath));
    8484    }
    8585}

  • trunk/Tools/Scripts/run-fast-jsc

    r155392 r155404  
    7575fi
    7676
    77 preScript=$testRoot/resources/standalone-pre.js
    78 postScript=$testRoot/resources/standalone-post.js
     77preScript=$testRoot/fast/js/resources/standalone-pre.js
     78postScript=$testRoot/fast/js/resources/standalone-post.js
    7979passList=$resultsRoot/passed
    8080failList=$resultsRoot/failed

  • trunk/Tools/Scripts/webkitperl/httpd.pm

    r155392 r155404  
    106106    my $httpdConfig = getHTTPDConfigPathForTestDirectory($testDirectory);
    107107    my $documentRoot = "$testDirectory/http/tests";
    108     my $jsTestResourcesDirectory = $testDirectory . "/resources";
     108    my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources";
    109109    my $mediaResourcesDirectory = $testDirectory . "/media";
    110110    my $typesConfig = "$testDirectory/http/conf/mime.types";

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py

    r155392 r155404  
    6161
    6262        test_dir = self._port_obj.layout_tests_dir()
    63         js_test_resources_dir = self._filesystem.join(test_dir, "resources")
     63        js_test_resources_dir = self._filesystem.join(test_dir, "fast", "js", "resources")
    6464        media_resources_dir = self._filesystem.join(test_dir, "media")
    6565        mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py

    r155392 r155404  
    6666
    6767        self._webkit_tests = os.path.join(self._layout_tests_dir, 'http', 'tests')
    68         self._js_test_resource = os.path.join(self._layout_tests_dir, 'resources')
     68        self._js_test_resource = os.path.join(self._layout_tests_dir, 'fast', 'js', 'resources')
    6969        self._media_resource = os.path.join(self._layout_tests_dir, 'media')
    7070

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py

    r155392 r155404  
    121121        tmpdir = tempfile.mkdtemp(prefix='webkitpytest')
    122122        self.maybe_make_dir(tmpdir, 'http', 'tests', 'websocket')
    123         self.maybe_make_dir(tmpdir, 'resources')
     123        self.maybe_make_dir(tmpdir, 'fast', 'js', 'resources')
    124124        self.maybe_make_dir(tmpdir, 'media')
    125125

  • trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py

    r155392 r155404  
    5858        config_file = host.filesystem.read_text_file("/mock/output_dir/lighttpd.conf")
    5959        self.assertEqual(re.findall(r"alias.url.+", config_file), [
    60             'alias.url = ( "/js-test-resources" => "/test.checkout/LayoutTests/resources" )',
     60            'alias.url = ( "/js-test-resources" => "/test.checkout/LayoutTests/fast/js/resources" )',
    6161            'alias.url += ( "/mock/one-additional-dir" => "/mock-checkout/one-additional-dir" )',
    6262            'alias.url += ( "/mock/another-additional-dir" => "/mock-checkout/one-additional-dir" )',

  • trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py

    r155392 r155404  
    4545    include_mapping = {
    4646        "js-test-style.css": "../../js/resources",
    47         "js-test-pre.js": "../../../resources",
    48         "js-test-post.js": "../../../resources",
     47        "js-test-pre.js": "../../js/resources",
     48        "js-test-post.js": "../../js/resources",
    4949        "desktop-gl-constants.js": "resources",
    5050    }

  • trunk/Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests_unittest.py

    r155392 r155404  
    6868        # Mappings to None are unchanged
    6969        styles = {
    70             "../resources/js-test-style.css": "../../../resources/js-test-style.css",
     70            "../resources/js-test-style.css": "../../js/resources/js-test-style.css",
    7171            "fail.css": None,
    7272            "resources/stylesheet.css": None,
    … …  
    7474        }
    7575        scripts = {
    76             "../resources/js-test-pre.js": "../../../resources/js-test-pre.js",
    77             "../resources/js-test-post.js": "../../../resources/js-test-post.js",
     76            "../resources/js-test-pre.js": "../../js/resources/js-test-pre.js",
     77            "../resources/js-test-post.js": "../../js/resources/js-test-post.js",
    7878            "../resources/desktop-gl-constants.js": "resources/desktop-gl-constants.js",
    7979
Note: See TracChangeset for help on using the changeset viewer.