Tools: Re-landing r155392 (Point Tools scripts to LayoutTests/resources).
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Sep 2013 02:46:55 +0000 (02:46 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 10 Sep 2013 02:46:55 +0000 (02:46 +0000)
https://bugs.webkit.org/show_bug.cgi?id=120899.

Not reviewed.

The webkitpy test failure that resulted in the rollout is due to
update_webgl_conformance_tests_unittest.py referencing js-test-style.css
which is to be deleted. Deleting that line fixes the issue.

* 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: Re-landing 155392 (Remove old fast/js/resources pre and post test files).
https://bugs.webkit.org/show_bug.cgi?id=120899.

Not reviewed.

* fast/js/resources/js-test-post-async.js: Removed.
* fast/js/resources/js-test-post.js: Removed.
* fast/js/resources/js-test-pre.js: Removed.
* fast/js/resources/standalone-post.js: Removed.
* fast/js/resources/standalone-pre.js: Removed.

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

16 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/js/resources/js-test-post-async.js [deleted file]
LayoutTests/fast/js/resources/js-test-post.js [deleted file]
LayoutTests/fast/js/resources/js-test-pre.js [deleted file]
LayoutTests/fast/js/resources/standalone-post.js [deleted file]
LayoutTests/fast/js/resources/standalone-pre.js [deleted file]
Tools/ChangeLog
Tools/Scripts/make-new-script-test
Tools/Scripts/run-fast-jsc
Tools/Scripts/webkitperl/httpd.pm
Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server_integrationtest.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py
Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests.py
Tools/Scripts/webkitpy/to_be_moved/update_webgl_conformance_tests_unittest.py

index e78b76f..a4432ed 100644 (file)
@@ -1,5 +1,18 @@
 2013-09-09  Mark Lam  <mark.lam@apple.com>
 
+        Re-landing 155392 (Remove old fast/js/resources pre and post test files).
+        https://bugs.webkit.org/show_bug.cgi?id=120899.
+
+        Not reviewed.
+
+        * fast/js/resources/js-test-post-async.js: Removed.
+        * fast/js/resources/js-test-post.js: Removed.
+        * fast/js/resources/js-test-pre.js: Removed.
+        * fast/js/resources/standalone-post.js: Removed.
+        * fast/js/resources/standalone-pre.js: Removed.
+
+2013-09-09  Mark Lam  <mark.lam@apple.com>
+
         Remove un-needed js-test-style.css.
         https://bugs.webkit.org/show_bug.cgi?id=120899.
 
diff --git a/LayoutTests/fast/js/resources/js-test-post-async.js b/LayoutTests/fast/js/resources/js-test-post-async.js
deleted file mode 100644 (file)
index c933d70..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-if (!errorMessage)
-    successfullyParsed = true;
-shouldBeTrue("successfullyParsed");
-debug('<br /><span class="pass">TEST COMPLETE</span>');
-
-if (window.testRunner)
-    testRunner.notifyDone();
diff --git a/LayoutTests/fast/js/resources/js-test-post.js b/LayoutTests/fast/js/resources/js-test-post.js
deleted file mode 100644 (file)
index 7bf7404..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-wasPostTestScriptParsed = true;
-
-if (window.jsTestIsAsync) {
-    if (window.testRunner)
-        testRunner.waitUntilDone();
-    if (window.wasFinishJSTestCalled)
-        finishJSTest();
-} else
-    finishJSTest();
diff --git a/LayoutTests/fast/js/resources/js-test-pre.js b/LayoutTests/fast/js/resources/js-test-pre.js
deleted file mode 100644 (file)
index b017207..0000000
+++ /dev/null
@@ -1,792 +0,0 @@
-// svg/dynamic-updates tests set enablePixelTesting=true, as we want to dump text + pixel results
-if (self.testRunner)
-    testRunner.dumpAsText(self.enablePixelTesting);
-
-var description, debug, successfullyParsed, errorMessage, silentTestPass, didPassSomeTestsSilently, didFailSomeTests;
-
-silentTestPass = false;
-didPassSomeTestsSilently = false;
-didFailSomeTests = false;
-
-(function() {
-
-    function getOrCreate(id, tagName)
-    {
-        var element = document.getElementById(id);
-        if (element)
-            return element;
-
-        element = document.createElement(tagName);
-        element.id = id;
-        var refNode;
-        var parent = document.body || document.documentElement;
-        if (id == "description")
-            refNode = getOrCreate("console", "div");
-        else
-            refNode = parent.firstChild;
-
-        parent.insertBefore(element, refNode);
-        return element;
-    }
-
-    description = function description(msg, quiet)
-    {
-        // For MSIE 6 compatibility
-        var span = document.createElement("span");
-        if (quiet)
-            span.innerHTML = '<p>' + msg + '</p><p>On success, you will see no "<span class="fail">FAIL</span>" messages, followed by "<span class="pass">TEST COMPLETE</span>".</p>';
-        else
-            span.innerHTML = '<p>' + msg + '</p><p>On success, you will see a series of "<span class="pass">PASS</span>" messages, followed by "<span class="pass">TEST COMPLETE</span>".</p>';
-
-        var description = getOrCreate("description", "p");
-        if (description.firstChild)
-            description.replaceChild(span, description.firstChild);
-        else
-            description.appendChild(span);
-    };
-
-    debug = function debug(msg)
-    {
-        var span = document.createElement("span");
-        getOrCreate("console", "div").appendChild(span); // insert it first so XHTML knows the namespace
-        span.innerHTML = msg + '<br />';
-    };
-
-    var css =
-        ".pass {" +
-            "font-weight: bold;" +
-            "color: green;" +
-        "}" +
-        ".fail {" +
-            "font-weight: bold;" +
-            "color: red;" +
-        "}" +
-        "#console {" +
-            "white-space: pre-wrap;" +
-            "font-family: monospace;" +
-        "}";
-
-    function insertStyleSheet()
-    {
-        var styleElement = document.createElement("style");
-        styleElement.textContent = css;
-        (document.head || document.documentElement).appendChild(styleElement);
-    }
-
-    if (!isWorker())
-        insertStyleSheet();
-
-    self.onerror = function(message)
-    {
-        errorMessage = message;
-    };
-
-})();
-
-function isWorker()
-{
-    // It's conceivable that someone would stub out 'document' in a worker so
-    // also check for childNodes, an arbitrary DOM-related object that is
-    // meaningless in a WorkerContext.
-    return (typeof document === 'undefined' || typeof document.childNodes === 'undefined') && !!self.importScripts;
-}
-
-function descriptionQuiet(msg) { description(msg, true); }
-
-function escapeHTML(text)
-{
-    return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/\0/g, "\\0");
-}
-
-function testPassed(msg)
-{
-    if (silentTestPass)
-        didPassSomeTestsSilently = true;
-    else
-        debug('<span><span class="pass">PASS</span> ' + escapeHTML(msg) + '</span>');
-}
-
-function testFailed(msg)
-{
-    didFailSomeTests = true;
-    debug('<span><span class="fail">FAIL</span> ' + escapeHTML(msg) + '</span>');
-}
-
-function areNumbersEqual(_actual, _expected)
-{
-    if (_expected === 0)
-        return _actual === _expected && (1/_actual) === (1/_expected);
-    if (_actual === _expected)
-        return true;
-    if (typeof(_expected) == "number" && isNaN(_expected))
-        return typeof(_actual) == "number" && isNaN(_actual);
-    return false;
-}
-
-function areArraysEqual(_a, _b)
-{
-    try {
-        if (_a.length !== _b.length)
-            return false;
-        for (var i = 0; i < _a.length; i++)
-            if (!areNumbersEqual(_a[i], _b[i]))
-                return false;
-    } catch (ex) {
-        return false;
-    }
-    return true;
-}
-
-function isMinusZero(n)
-{
-    // the only way to tell 0 from -0 in JS is the fact that 1/-0 is
-    // -Infinity instead of Infinity
-    return n === 0 && 1/n < 0;
-}
-
-function isTypedArray(array)
-{
-    return array instanceof Int8Array
-        || array instanceof Int16Array
-        || array instanceof Int32Array
-        || array instanceof Uint8Array
-        || array instanceof Uint8ClampedArray
-        || array instanceof Uint16Array
-        || array instanceof Uint32Array
-        || array instanceof Float32Array
-        || array instanceof Float64Array;
-}
-
-function isResultCorrect(_actual, _expected)
-{
-    if (areNumbersEqual(_actual, _expected))
-        return true;
-    if (_expected
-        && (Object.prototype.toString.call(_expected) ==
-            Object.prototype.toString.call([])
-            || isTypedArray(_expected)))
-        return areArraysEqual(_actual, _expected);
-    return false;
-}
-
-function stringify(v)
-{
-    if (v === 0 && 1/v < 0)
-        return "-0";
-    else if (isTypedArray(v))
-        return v.__proto__.constructor.name + ":[" + Array.prototype.join.call(v, ",") + "]";
-    else
-        return "" + v;
-}
-
-function evalAndLog(_a, _quiet)
-{
-  if (typeof _a != "string")
-    debug("WARN: tryAndLog() expects a string argument");
-
-  // Log first in case things go horribly wrong or this causes a sync event.
-  if (!_quiet)
-    debug(_a);
-
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-    testFailed(_a + " threw exception " + e);
-  }
-  return _av;
-}
-
-function shouldBe(_a, _b, quiet)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldBe() expects string arguments");
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-  var _bv = eval(_b);
-
-  if (exception)
-    testFailed(_a + " should be " + stringify(_bv) + ". Threw exception " + exception);
-  else if (isResultCorrect(_av, _bv)) {
-    if (!quiet) {
-        testPassed(_a + " is " + _b);
-    }
-  } else if (typeof(_av) == typeof(_bv))
-    testFailed(_a + " should be " + stringify(_bv) + ". Was " + stringify(_av) + ".");
-  else
-    testFailed(_a + " should be " + stringify(_bv) + " (of type " + typeof _bv + "). Was " + _av + " (of type " + typeof _av + ").");
-}
-
-function dfgShouldBe(theFunction, _a, _b)
-{
-  if (typeof theFunction != "function" || typeof _a != "string" || typeof _b != "string")
-    debug("WARN: dfgShouldBe() expects a function and two strings");
-  noInline(theFunction);
-  var exception;
-  var values = [];
-
-  // Defend against tests that muck with numeric properties on array.prototype.
-  values.__proto__ = null;
-  values.push = Array.prototype.push;
-  
-  try {
-    while (!dfgCompiled({f:theFunction}))
-      values.push(eval(_a));
-    values.push(eval(_a));
-  } catch (e) {
-    exception = e;
-  }
-
-  var _bv = eval(_b);
-  if (exception)
-    testFailed(_a + " should be " + stringify(_bv) + ". On iteration " + (values.length + 1) + ", threw exception " + exception);
-  else {
-    var allPassed = true;
-    for (var i = 0; i < values.length; ++i) {
-      var _av = values[i];
-      if (isResultCorrect(_av, _bv))
-        continue;
-      if (typeof(_av) == typeof(_bv))
-        testFailed(_a + " should be " + stringify(_bv) + ". On iteration " + (i + 1) + ", was " + stringify(_av) + ".");
-      else
-        testFailed(_a + " should be " + stringify(_bv) + " (of type " + typeof _bv + "). On iteration " + (i + 1) + ", was " + _av + " (of type " + typeof _av + ").");
-      allPassed = false;
-    }
-    if (allPassed)
-      testPassed(_a + " is " + _b + " on all iterations including after DFG tier-up.");
-  }
-  
-  return values.length;
-}
-
-// Execute condition every 5 milliseconds until it succeed or failureTime is reached.
-// completionHandler is executed on success, failureHandler is executed on timeout.
-function _waitForCondition(condition, failureTime, completionHandler, failureHandler)
-{
-  if (condition()) {
-    completionHandler();
-  } else if (Date.now() > failureTime) {
-    failureHandler();
-  } else {
-    setTimeout(_waitForCondition, 5, condition, failureTime, completionHandler, failureHandler);
-  }
-}
-
-function shouldBecomeEqual(_a, _b, completionHandler, timeout)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldBecomeEqual() expects string arguments");
-
-  if (timeout === undefined)
-    timeout = 500;
-
-  var condition = function() {
-    var exception;
-    var _av;
-    try {
-      _av = eval(_a);
-    } catch (e) {
-      exception = e;
-    }
-    var _bv = eval(_b);
-    if (exception)
-      testFailed(_a + " should become " + _bv + ". Threw exception " + exception);
-    if (isResultCorrect(_av, _bv)) {
-      testPassed(_a + " became " + _b);
-      return true;
-    }
-    return false;
-  };
-  var failureTime = Date.now() + timeout;
-  var failureHandler = function () {
-    testFailed(_a + " failed to change to " + _b + " in " + (timeout / 1000) + " seconds.");
-    completionHandler();
-  };
-  _waitForCondition(condition, failureTime, completionHandler, failureHandler);
-}
-
-function shouldBecomeEqualToString(value, reference, completionHandler, timeout)
-{
-  if (typeof value !== "string" || typeof reference !== "string")
-    debug("WARN: shouldBecomeEqualToString() expects string arguments");
-  var unevaledString = JSON.stringify(reference);
-  shouldBecomeEqual(value, unevaledString, completionHandler, timeout);
-}
-
-function shouldBeType(_a, _type) {
-  var exception;
-  var _av;
-  try {
-    _av = eval(_a);
-  } catch (e) {
-    exception = e;
-  }
-
-  var _typev = eval(_type);
-  if (_av instanceof _typev) {
-    testPassed(_a + " is an instance of " + _type);
-  } else {
-    testFailed(_a + " is not an instance of " + _type);
-  }
-}
-
-// Variant of shouldBe()--confirms that result of eval(_to_eval) is within
-// numeric _tolerance of numeric _target.
-function shouldBeCloseTo(_to_eval, _target, _tolerance, quiet)
-{
-  if (typeof _to_eval != "string") {
-    testFailed("shouldBeCloseTo() requires string argument _to_eval. was type " + typeof _to_eval);
-    return;
-  }
-  if (typeof _target != "number") {
-    testFailed("shouldBeCloseTo() requires numeric argument _target. was type " + typeof _target);
-    return;
-  }
-  if (typeof _tolerance != "number") {
-    testFailed("shouldBeCloseTo() requires numeric argument _tolerance. was type " + typeof _tolerance);
-    return;
-  }
-
-  var _result;
-  try {
-     _result = eval(_to_eval);
-  } catch (e) {
-    testFailed(_to_eval + " should be within " + _tolerance + " of "
-               + _target + ". Threw exception " + e);
-    return;
-  }
-
-  if (typeof(_result) != typeof(_target)) {
-    testFailed(_to_eval + " should be of type " + typeof _target
-               + " but was of type " + typeof _result);
-  } else if (Math.abs(_result - _target) <= _tolerance) {
-    if (!quiet) {
-        testPassed(_to_eval + " is within " + _tolerance + " of " + _target);
-    }
-  } else {
-    testFailed(_to_eval + " should be within " + _tolerance + " of " + _target
-               + ". Was " + _result + ".");
-  }
-}
-
-function shouldNotBe(_a, _b, quiet)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldNotBe() expects string arguments");
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-  var _bv = eval(_b);
-
-  if (exception)
-    testFailed(_a + " should not be " + _bv + ". Threw exception " + exception);
-  else if (!isResultCorrect(_av, _bv)) {
-    if (!quiet) {
-        testPassed(_a + " is not " + _b);
-    }
-  } else
-    testFailed(_a + " should not be " + _bv + ".");
-}
-
-function shouldBecomeDifferent(_a, _b, completionHandler, timeout)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldBecomeDifferent() expects string arguments");
-  if (timeout === undefined)
-    timeout = 500;
-
-  var condition = function() {
-    var exception;
-    var _av;
-    try {
-      _av = eval(_a);
-    } catch (e) {
-      exception = e;
-    }
-    var _bv = eval(_b);
-    if (exception)
-      testFailed(_a + " should became not equal to " + _bv + ". Threw exception " + exception);
-    if (!isResultCorrect(_av, _bv)) {
-      testPassed(_a + " became different from " + _b);
-      return true;
-    }
-    return false;
-  };
-  var failureTime = Date.now() + timeout;
-  var failureHandler = function () {
-    testFailed(_a + " did not become different from " + _b + " in " + (timeout / 1000) + " seconds.");
-    completionHandler();
-  };
-  _waitForCondition(condition, failureTime, completionHandler, failureHandler);
-}
-
-function shouldBeTrue(_a) { shouldBe(_a, "true"); }
-function shouldBeTrueQuiet(_a) { shouldBe(_a, "true", true); }
-function shouldBeFalse(_a) { shouldBe(_a, "false"); }
-function shouldBeNaN(_a) { shouldBe(_a, "NaN"); }
-function shouldBeNull(_a) { shouldBe(_a, "null"); }
-function shouldBeZero(_a) { shouldBe(_a, "0"); }
-
-function shouldBeEqualToString(a, b)
-{
-  if (typeof a !== "string" || typeof b !== "string")
-    debug("WARN: shouldBeEqualToString() expects string arguments");
-  var unevaledString = JSON.stringify(b);
-  shouldBe(a, unevaledString);
-}
-
-function shouldBeEmptyString(_a) { shouldBeEqualToString(_a, ""); }
-
-function shouldEvaluateTo(actual, expected) {
-  // A general-purpose comparator.  'actual' should be a string to be
-  // evaluated, as for shouldBe(). 'expected' may be any type and will be
-  // used without being eval'ed.
-  if (expected == null) {
-    // Do this before the object test, since null is of type 'object'.
-    shouldBeNull(actual);
-  } else if (typeof expected == "undefined") {
-    shouldBeUndefined(actual);
-  } else if (typeof expected == "function") {
-    // All this fuss is to avoid the string-arg warning from shouldBe().
-    try {
-      actualValue = eval(actual);
-    } catch (e) {
-      testFailed("Evaluating " + actual + ": Threw exception " + e);
-      return;
-    }
-    shouldBe("'" + actualValue.toString().replace(/\n/g, "") + "'",
-             "'" + expected.toString().replace(/\n/g, "") + "'");
-  } else if (typeof expected == "object") {
-    shouldBeTrue(actual + " == '" + expected + "'");
-  } else if (typeof expected == "string") {
-    shouldBe(actual, expected);
-  } else if (typeof expected == "boolean") {
-    shouldBe("typeof " + actual, "'boolean'");
-    if (expected)
-      shouldBeTrue(actual);
-    else
-      shouldBeFalse(actual);
-  } else if (typeof expected == "number") {
-    shouldBe(actual, stringify(expected));
-  } else {
-    debug(expected + " is unknown type " + typeof expected);
-    shouldBeTrue(actual, "'"  +expected.toString() + "'");
-  }
-}
-
-function shouldBeNonZero(_a)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  if (exception)
-    testFailed(_a + " should be non-zero. Threw exception " + exception);
-  else if (_av != 0)
-    testPassed(_a + " is non-zero.");
-  else
-    testFailed(_a + " should be non-zero. Was " + _av);
-}
-
-function shouldBeNonNull(_a)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  if (exception)
-    testFailed(_a + " should be non-null. Threw exception " + exception);
-  else if (_av != null)
-    testPassed(_a + " is non-null.");
-  else
-    testFailed(_a + " should be non-null. Was " + _av);
-}
-
-function shouldBeUndefined(_a)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  if (exception)
-    testFailed(_a + " should be undefined. Threw exception " + exception);
-  else if (typeof _av == "undefined")
-    testPassed(_a + " is undefined.");
-  else
-    testFailed(_a + " should be undefined. Was " + _av);
-}
-
-function shouldBeDefined(_a)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  if (exception)
-    testFailed(_a + " should be defined. Threw exception " + exception);
-  else if (_av !== undefined)
-    testPassed(_a + " is defined.");
-  else
-    testFailed(_a + " should be defined. Was " + _av);
-}
-
-function shouldBeGreaterThanOrEqual(_a, _b) {
-    if (typeof _a != "string" || typeof _b != "string")
-        debug("WARN: shouldBeGreaterThanOrEqual expects string arguments");
-
-    var exception;
-    var _av;
-    try {
-        _av = eval(_a);
-    } catch (e) {
-        exception = e;
-    }
-    var _bv = eval(_b);
-
-    if (exception)
-        testFailed(_a + " should be >= " + _b + ". Threw exception " + exception);
-    else if (typeof _av == "undefined" || _av < _bv)
-        testFailed(_a + " should be >= " + _b + ". Was " + _av + " (of type " + typeof _av + ").");
-    else
-        testPassed(_a + " is >= " + _b);
-}
-
-function shouldNotThrow(_a) {
-    try {
-        eval(_a);
-        testPassed(_a + " did not throw exception.");
-    } catch (e) {
-        testFailed(_a + " should not throw exception. Threw exception " + e + ".");
-    }
-}
-
-function shouldThrow(_a, _e)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  var _ev;
-  if (_e)
-      _ev =  eval(_e);
-
-  if (exception) {
-    if (typeof _e == "undefined" || exception == _ev)
-      testPassed(_a + " threw exception " + exception + ".");
-    else
-      testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Threw exception " + exception + ".");
-  } else if (typeof _av == "undefined")
-    testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was undefined.");
-  else
-    testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was " + _av + ".");
-}
-
-function shouldHaveHadError(message)
-{
-    if (errorMessage) {
-        if (!message)
-            testPassed("Got expected error");
-        else if (errorMessage.indexOf(message) !== -1)
-            testPassed("Got expected error: '" + message + "'");
-        else
-            testFailed("Unexpexted error '" + message + "'");
-    } else
-        testFailed("Missing expexted error");
-    errorMessage = undefined;
-}
-
-function gc() {
-    if (typeof GCController !== "undefined")
-        GCController.collect();
-    else {
-        var gcRec = function (n) {
-            if (n < 1)
-                return {};
-            var temp = {i: "ab" + i + (i / 100000)};
-            temp += "foo";
-            gcRec(n-1);
-        };
-        for (var i = 0; i < 1000; i++)
-            gcRec(10)
-    }
-}
-
-function dfgCompiled(argument)
-{
-    var numberOfCompiles = "compiles" in argument ? argument.compiles : 1;
-    
-    if (!("f" in argument))
-        throw new Error("dfgCompiled called with invalid argument.");
-    
-    if (argument.f instanceof Array) {
-        for (var i = 0; i < argument.f.length; ++i) {
-            if (testRunner.numberOfDFGCompiles(argument.f[i]) < numberOfCompiles)
-                return false;
-        }
-    } else {
-        if (testRunner.numberOfDFGCompiles(argument.f) < numberOfCompiles)
-            return false;
-    }
-    
-    return true;
-}
-
-function dfgIncrement(argument)
-{
-    if (!self.testRunner)
-        return argument.i;
-    
-    if (argument.i < argument.n)
-        return argument.i;
-    
-    if (didFailSomeTests)
-        return argument.i;
-    
-    if (!dfgCompiled(argument))
-        return "start" in argument ? argument.start : 0;
-    
-    return argument.i;
-}
-
-function noInline(theFunction)
-{
-    if (!self.testRunner)
-        return;
-    
-    testRunner.neverInlineFunction(theFunction);
-}
-
-function isSuccessfullyParsed()
-{
-    // FIXME: Remove this and only report unexpected syntax errors.
-    if (!errorMessage)
-        successfullyParsed = true;
-    shouldBeTrue("successfullyParsed");
-    if (silentTestPass && didPassSomeTestsSilently)
-        debug("Passed some tests silently.");
-    if (silentTestPass && didFailSomeTests)
-        debug("Some tests failed.");
-    debug('<br /><span class="pass">TEST COMPLETE</span>');
-}
-
-// It's possible for an async test to call finishJSTest() before js-test-post.js
-// has been parsed.
-function finishJSTest()
-{
-    wasFinishJSTestCalled = true;
-    if (!self.wasPostTestScriptParsed)
-        return;
-    isSuccessfullyParsed();
-    if (self.jsTestIsAsync && self.testRunner)
-        testRunner.notifyDone();
-}
-
-function startWorker(testScriptURL, shared)
-{
-    self.jsTestIsAsync = true;
-    debug('Starting worker: ' + testScriptURL);
-    var worker = shared ? new SharedWorker(testScriptURL, "Shared Worker") : new Worker(testScriptURL);
-    worker.onmessage = function(event)
-    {
-        var workerPrefix = "[Worker] ";
-        if (event.data.length < 5 || event.data.charAt(4) != ':') {
-          debug(workerPrefix + event.data);
-          return;
-        }
-        var code = event.data.substring(0, 4);
-        var payload = workerPrefix + event.data.substring(5);
-        if (code == "PASS")
-            testPassed(payload);
-        else if (code == "FAIL")
-            testFailed(payload);
-        else if (code == "DESC")
-            description(payload);
-        else if (code == "DONE")
-            finishJSTest();
-        else
-            debug(workerPrefix + event.data);
-    };
-
-    worker.onerror = function(event)
-    {
-        debug('Got error from worker: ' + event.message);
-        finishJSTest();
-    }
-
-    if (shared) {
-        worker.port.onmessage = function(event) { worker.onmessage(event); };
-        worker.port.start();
-    }
-    return worker;
-}
-
-if (isWorker()) {
-    var workerPort = self;
-    if (self.name == "Shared Worker") {
-        self.onconnect = function(e) {
-            workerPort = e.ports[0];
-            workerPort.onmessage = function(event)
-            {
-                var colon = event.data.indexOf(":");
-                if (colon == -1) {
-                    testFailed("Unrecognized message to shared worker: " + event.data);
-                    return;
-                }
-                var code = event.data.substring(0, colon);
-                var payload = event.data.substring(colon + 1);
-                try {
-                    if (code == "IMPORT")
-                        importScripts(payload);
-                    else
-                        testFailed("Unrecognized message to shared worker: " + event.data);
-                } catch (ex) {
-                    testFailed("Caught exception in shared worker onmessage: " + ex);
-                }
-            };
-        };
-    }
-    description = function(msg, quiet) {
-        workerPort.postMessage('DESC:' + msg);
-    }
-    testFailed = function(msg) {
-        workerPort.postMessage('FAIL:' + msg);
-    }
-    testPassed = function(msg) {
-        workerPort.postMessage('PASS:' + msg);
-    }
-    finishJSTest = function() {
-        workerPort.postMessage('DONE:');
-    }
-    debug = function(msg) {
-        workerPort.postMessage(msg);
-    }
-}
diff --git a/LayoutTests/fast/js/resources/standalone-post.js b/LayoutTests/fast/js/resources/standalone-post.js
deleted file mode 100644 (file)
index 71e2235..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-wasPostTestScriptParsed = true;
-
-finishJSTest();
diff --git a/LayoutTests/fast/js/resources/standalone-pre.js b/LayoutTests/fast/js/resources/standalone-pre.js
deleted file mode 100644 (file)
index 2f30cdd..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-var wasPostTestScriptParsed = false;
-var errorMessage;
-var self = this;
-
-self.testRunner = {
-    neverInlineFunction: neverInlineFunction,
-    numberOfDFGCompiles: numberOfDFGCompiles
-};
-
-var silentTestPass, didPassSomeTestsSilently, didFailSomeTests, successfullyParsed;
-silentTestPass = false;
-didPassSomeTestsSilenty = false;
-didFaileSomeTests = false;
-
-function description(msg)
-{
-    print(msg);
-    print("\nOn success, you will see a series of \"PASS\" messages, followed by \"TEST COMPLETE\".\n");
-    print();
-}
-
-function debug(msg)
-{
-    print(msg);
-}
-
-function escapeString(text)
-{
-    return text.replace(/\0/g, "");
-}
-
-function testPassed(msg)
-{
-    if (silentTestPass)
-        didPassSomeTestsSilently = true;
-    else
-        print("PASS", escapeString(msg));
-}
-
-function testFailed(msg)
-{
-    didFailSomeTests = true;
-    print("FAIL", escapeString(msg));
-}
-
-function areNumbersEqual(_actual, _expected)
-{
-    if (_expected === 0)
-        return _actual === _expected && (1/_actual) === (1/_expected);
-    if (_actual === _expected)
-        return true;
-    if (typeof(_expected) == "number" && isNaN(_expected))
-        return typeof(_actual) == "number" && isNaN(_actual);
-    return false;
-}
-
-function areArraysEqual(_a, _b)
-{
-    try {
-        if (_a.length !== _b.length)
-            return false;
-        for (var i = 0; i < _a.length; i++)
-            if (!areNumbersEqual(_a[i], _b[i]))
-                return false;
-    } catch (ex) {
-        return false;
-    }
-    return true;
-}
-
-function isMinusZero(n)
-{
-    // the only way to tell 0 from -0 in JS is the fact that 1/-0 is
-    // -Infinity instead of Infinity
-    return n === 0 && 1/n < 0;
-}
-
-function isTypedArray(array)
-{
-    return array instanceof Int8Array
-        || array instanceof Int16Array
-        || array instanceof Int32Array
-        || array instanceof Uint8Array
-        || array instanceof Uint8ClampedArray
-        || array instanceof Uint16Array
-        || array instanceof Uint32Array
-        || array instanceof Float32Array
-        || array instanceof Float64Array;
-}
-
-function isResultCorrect(_actual, _expected)
-{
-    if (areNumbersEqual(_actual, _expected))
-        return true;
-    if (_expected
-        && (Object.prototype.toString.call(_expected) ==
-            Object.prototype.toString.call([])
-            || isTypedArray(_expected)))
-        return areArraysEqual(_actual, _expected);
-    return false;
-}
-
-function stringify(v)
-{
-    if (v === 0 && 1/v < 0)
-        return "-0";
-    else if (isTypedArray(v))
-        return v.__proto__.constructor.name + ":[" + Array.prototype.join.call(v, ",") + "]";
-    else
-        return "" + v;
-}
-
-function shouldBe(_a, _b)
-{
-  if (typeof _a != "string" || typeof _b != "string")
-    debug("WARN: shouldBe() expects string arguments");
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-  var _bv = eval(_b);
-
-  if (exception)
-    testFailed(_a + " should be " + stringify(_bv) + ". Threw exception " + exception);
-  else if (isResultCorrect(_av, _bv))
-    testPassed(_a + " is " + _b);
-  else if (typeof(_av) == typeof(_bv))
-    testFailed(_a + " should be " + stringify(_bv) + ". Was " + stringify(_av) + ".");
-  else
-    testFailed(_a + " should be " + stringify(_bv) + " (of type " + typeof _bv + "). Was " + _av + " (of type " + typeof _av + ").");
-}
-
-function dfgShouldBe(theFunction, _a, _b)
-{
-  if (typeof theFunction != "function" || typeof _a != "string" || typeof _b != "string")
-    debug("WARN: dfgShouldBe() expects a function and two strings");
-  noInline(theFunction);
-  var exception;
-  var values = [];
-
-  // Defend against tests that muck with numeric properties on array.prototype.
-  values.__proto__ = null;
-  values.push = Array.prototype.push;
-  
-  try {
-    while (!dfgCompiled({f:theFunction}))
-      values.push(eval(_a));
-    values.push(eval(_a));
-  } catch (e) {
-    exception = e;
-  }
-
-  var _bv = eval(_b);
-  if (exception)
-    testFailed(_a + " should be " + stringify(_bv) + ". On iteration " + (values.length + 1) + ", threw exception " + exception);
-  else {
-    var allPassed = true;
-    for (var i = 0; i < values.length; ++i) {
-      var _av = values[i];
-      if (isResultCorrect(_av, _bv))
-        continue;
-      if (typeof(_av) == typeof(_bv))
-        testFailed(_a + " should be " + stringify(_bv) + ". On iteration " + (i + 1) + ", was " + stringify(_av) + ".");
-      else
-        testFailed(_a + " should be " + stringify(_bv) + " (of type " + typeof _bv + "). On iteration " + (i + 1) + ", was " + _av + " (of type " + typeof _av + ").");
-      allPassed = false;
-    }
-    if (allPassed)
-      testPassed(_a + " is " + _b + " on all iterations including after DFG tier-up.");
-  }
-  
-  return values.length;
-}
-
-function shouldBeTrue(_a) { shouldBe(_a, "true"); }
-function shouldBeFalse(_a) { shouldBe(_a, "false"); }
-function shouldBeNaN(_a) { shouldBe(_a, "NaN"); }
-function shouldBeNull(_a) { shouldBe(_a, "null"); }
-
-function shouldBeEqualToString(a, b)
-{
-  if (typeof a !== "string" || typeof b !== "string")
-    debug("WARN: shouldBeEqualToString() expects string arguments");
-  var unevaledString = JSON.stringify(b);
-  shouldBe(a, unevaledString);
-}
-
-function shouldBeUndefined(_a)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  if (exception)
-    testFailed(_a + " should be undefined. Threw exception " + exception);
-  else if (typeof _av == "undefined")
-    testPassed(_a + " is undefined.");
-  else
-    testFailed(_a + " should be undefined. Was " + _av);
-}
-
-
-function shouldThrow(_a, _e)
-{
-  var exception;
-  var _av;
-  try {
-     _av = eval(_a);
-  } catch (e) {
-     exception = e;
-  }
-
-  var _ev;
-  if (_e)
-      _ev =  eval(_e);
-
-  if (exception) {
-    if (typeof _e == "undefined" || exception == _ev)
-      testPassed(_a + " threw exception " + exception + ".");
-    else
-      testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Threw exception " + exception + ".");
-  } else if (typeof _av == "undefined")
-    testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was undefined.");
-  else
-    testFailed(_a + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was " + _av + ".");
-}
-
-function isSuccessfullyParsed()
-{
-    // FIXME: Remove this and only report unexpected syntax errors.
-    if (!errorMessage)
-        successfullyParsed = true;
-    shouldBeTrue("successfullyParsed");
-    if (silentTestPass && didPassSomeTestsSilently)
-        debug("Passed some tests silently.");
-    if (silentTestPass && didFailSomeTests)
-        debug("Some tests failed.");
-    debug("\nTEST COMPLETE\n");
-}
-
-
-function dfgCompiled(argument)
-{
-    var numberOfCompiles = "compiles" in argument ? argument.compiles : 1;
-    
-    if (!("f" in argument))
-        throw new Error("dfgCompiled called with invalid argument.");
-    
-    if (argument.f instanceof Array) {
-        for (var i = 0; i < argument.f.length; ++i) {
-            if (testRunner.numberOfDFGCompiles(argument.f[i]) < numberOfCompiles)
-                return false;
-        }
-    } else {
-        if (testRunner.numberOfDFGCompiles(argument.f) < numberOfCompiles)
-            return false;
-    }
-    
-    return true;
-}
-
-function dfgIncrement(argument)
-{
-    if (!self.testRunner)
-        return argument.i;
-    
-    if (argument.i < argument.n)
-        return argument.i;
-    
-    if (didFailSomeTests)
-        return argument.i;
-    
-    if (!dfgCompiled(argument))
-        return "start" in argument ? argument.start : 0;
-    
-    return argument.i;
-}
-
-function noInline(theFunction)
-{
-    if (!self.testRunner)
-        return;
-    
-    testRunner.neverInlineFunction(theFunction);
-}
-
-// It's possible for an async test to call finishJSTest() before js-test-post.js
-// has been parsed.
-function finishJSTest()
-{
-    wasFinishJSTestCalled = true;
-    if (!wasPostTestScriptParsed)
-        return;
-    isSuccessfullyParsed();
-}
index ff354fa..00f5506 100644 (file)
@@ -1,5 +1,34 @@
 2013-09-09  Mark Lam  <mark.lam@apple.com>
 
+        Re-landing r155392 (Point Tools scripts to LayoutTests/resources).
+        https://bugs.webkit.org/show_bug.cgi?id=120899.
+
+        Not reviewed.
+
+        The webkitpy test failure that resulted in the rollout is due to
+        update_webgl_conformance_tests_unittest.py referencing js-test-style.css
+        which is to be deleted. Deleting that line fixes the issue.
+
+        * 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):
+
+2013-09-09  Mark Lam  <mark.lam@apple.com>
+
         Rolling out r155392 (Point Tools scripts to LayoutTests/resources): breaks tests.
         https://bugs.webkit.org/show_bug.cgi?id=120899.
 
index 59fbfa3..08a8d05 100755 (executable)
@@ -80,7 +80,7 @@ sub makePathToSharedSources
     if ($isHTTPTest) {
         return "/js-test-resources";
     } else {
-        return File::Spec->abs2rel("fast/js/resources/", dirname($testAbsolutePath));
+        return File::Spec->abs2rel("resources/", dirname($testAbsolutePath));
     }
 }
 
index 8e3be3c..606fbb7 100755 (executable)
@@ -74,8 +74,8 @@ then
     testList=$testRoot/fast/js/jsc-test-list
 fi
 
-preScript=$testRoot/fast/js/resources/standalone-pre.js
-postScript=$testRoot/fast/js/resources/standalone-post.js
+preScript=$testRoot/resources/standalone-pre.js
+postScript=$testRoot/resources/standalone-post.js
 passList=$resultsRoot/passed
 failList=$resultsRoot/failed
 crashList=$resultsRoot/crashed
index f61dfa0..4a2679d 100644 (file)
@@ -105,7 +105,7 @@ sub getDefaultConfigForTestDirectory
 
     my $httpdConfig = getHTTPDConfigPathForTestDirectory($testDirectory);
     my $documentRoot = "$testDirectory/http/tests";
-    my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources";
+    my $jsTestResourcesDirectory = $testDirectory . "/resources";
     my $mediaResourcesDirectory = $testDirectory . "/media";
     my $typesConfig = "$testDirectory/http/conf/mime.types";
     my $httpdLockFile = File::Spec->catfile($httpdPidDir, "httpd.lock");
index eb64d82..e00a9a0 100644 (file)
@@ -60,7 +60,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase):
         self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % self._name)
 
         test_dir = self._port_obj.layout_tests_dir()
-        js_test_resources_dir = self._filesystem.join(test_dir, "fast", "js", "resources")
+        js_test_resources_dir = self._filesystem.join(test_dir, "resources")
         media_resources_dir = self._filesystem.join(test_dir, "media")
         mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
         cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-httpd.pem")
index 604f76b..1fbf132 100644 (file)
@@ -65,7 +65,7 @@ class Lighttpd(http_server_base.HttpServerBase):
             self._layout_tests_dir = self._port_obj.layout_tests_dir()
 
         self._webkit_tests = os.path.join(self._layout_tests_dir, 'http', 'tests')
-        self._js_test_resource = os.path.join(self._layout_tests_dir, 'fast', 'js', 'resources')
+        self._js_test_resource = os.path.join(self._layout_tests_dir, 'resources')
         self._media_resource = os.path.join(self._layout_tests_dir, 'media')
 
         # Self generated certificate for SSL server (for client cert get
index aa6e59d..0cd00e4 100644 (file)
@@ -120,7 +120,7 @@ class BaseTest(unittest.TestCase):
 
         tmpdir = tempfile.mkdtemp(prefix='webkitpytest')
         self.maybe_make_dir(tmpdir, 'http', 'tests', 'websocket')
-        self.maybe_make_dir(tmpdir, 'fast', 'js', 'resources')
+        self.maybe_make_dir(tmpdir, 'resources')
         self.maybe_make_dir(tmpdir, 'media')
 
         self.assert_servers_are_down([18000])
index 621838f..0dd7916 100644 (file)
@@ -57,7 +57,7 @@ class TestHttpServer(unittest.TestCase):
 
         config_file = host.filesystem.read_text_file("/mock/output_dir/lighttpd.conf")
         self.assertEqual(re.findall(r"alias.url.+", config_file), [
-            'alias.url = ( "/js-test-resources" => "/test.checkout/LayoutTests/fast/js/resources" )',
+            'alias.url = ( "/js-test-resources" => "/test.checkout/LayoutTests/resources" )',
             'alias.url += ( "/mock/one-additional-dir" => "/mock-checkout/one-additional-dir" )',
             'alias.url += ( "/mock/another-additional-dir" => "/mock-checkout/one-additional-dir" )',
             'alias.url += ( "/media-resources" => "/test.checkout/LayoutTests/media" )',
index c7082c8..e31b460 100644 (file)
@@ -44,8 +44,8 @@ def translate_includes(text):
     # Assumption: these filenames are globally unique.
     include_mapping = {
         "js-test-style.css": "../../js/resources",
-        "js-test-pre.js": "../../js/resources",
-        "js-test-post.js": "../../js/resources",
+        "js-test-pre.js": "../../../resources",
+        "js-test-post.js": "../../../resources",
         "desktop-gl-constants.js": "resources",
     }
 
index 028a4c6..c5547f8 100644 (file)
@@ -67,14 +67,13 @@ class TestTranslation(unittest.TestCase):
     def test_include_rewriting(self):
         # Mappings to None are unchanged
         styles = {
-            "../resources/js-test-style.css": "../../js/resources/js-test-style.css",
             "fail.css": None,
             "resources/stylesheet.css": None,
             "../resources/style.css": None,
         }
         scripts = {
-            "../resources/js-test-pre.js": "../../js/resources/js-test-pre.js",
-            "../resources/js-test-post.js": "../../js/resources/js-test-post.js",
+            "../resources/js-test-pre.js": "../../../resources/js-test-pre.js",
+            "../resources/js-test-post.js": "../../../resources/js-test-post.js",
             "../resources/desktop-gl-constants.js": "resources/desktop-gl-constants.js",
 
             "resources/shadow-offset.js": None,