Skip to content

Commit

Permalink
Tools: Rolling out r155392 (Point Tools scripts to LayoutTests/resour…
Browse files Browse the repository at this point in the history
…ces): 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.



Canonical link: https://commits.webkit.org/138979@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Mark Lam committed Sep 10, 2013
1 parent f35a80a commit dbcda0c
Show file tree
Hide file tree
Showing 16 changed files with 1,164 additions and 13 deletions.
13 changes: 13 additions & 0 deletions LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
2013-09-09 Mark Lam <mark.lam@apple.com>

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.

2013-09-09 Mark Lam <mark.lam@apple.com>

Fix path to post file in a fwe tests, and adjust the expected results to match.
Expand Down
7 changes: 7 additions & 0 deletions LayoutTests/fast/js/resources/js-test-post-async.js
@@ -0,0 +1,7 @@
if (!errorMessage)
successfullyParsed = true;
shouldBeTrue("successfullyParsed");
debug('<br /><span class="pass">TEST COMPLETE</span>');

if (window.testRunner)
testRunner.notifyDone();
9 changes: 9 additions & 0 deletions LayoutTests/fast/js/resources/js-test-post.js
@@ -0,0 +1,9 @@
wasPostTestScriptParsed = true;

if (window.jsTestIsAsync) {
if (window.testRunner)
testRunner.waitUntilDone();
if (window.wasFinishJSTestCalled)
finishJSTest();
} else
finishJSTest();

0 comments on commit dbcda0c

Please sign in to comment.