[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
simon.fraser at apple.com
simon.fraser at apple.com
Wed Dec 22 14:04:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 07f141c93669ac2023b52b5ac8d9e6e77ae8bc68
Author: simon.fraser at apple.com <simon.fraser at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Oct 3 04:24:34 2010 +0000
2010-10-02 Simon Fraser <simon.fraser at apple.com>
For a ref test, load the ref in the same format (HTML4 vs XHTML1)
as the test.
* CSSTestSuiteHarness/harness/harness.js:
(TestSuite.prototype.loadRef):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/CSSTestSuiteHarness/harness/harness.js b/WebKitTools/CSSTestSuiteHarness/harness/harness.js
index 13a5b84..632d88d 100644
--- a/WebKitTools/CSSTestSuiteHarness/harness/harness.js
+++ b/WebKitTools/CSSTestSuiteHarness/harness/harness.js
@@ -718,11 +718,12 @@ TestSuite.prototype.clearTest = function()
TestSuite.prototype.loadRef = function(test)
{
- // Refs are always .xht files
- var refURL = kTestSuiteHome + kXHTML1Data.path + '/' + test.reference;
+ // Suites 20101001 and earlier used .xht refs, even for HTML tests, so strip off
+ // the extension and use the same format as the test.
+ var ref = test.reference.replace(/(\.xht)?$/, '');
var iframe = document.getElementById('ref-frame');
- iframe.src = refURL;
+ iframe.src = this.urlForTest(ref);
}
TestSuite.prototype.loadTestByName = function(testName)
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 60d89cd..e7bca44 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,13 @@
2010-10-02 Simon Fraser <simon.fraser at apple.com>
+ For a ref test, load the ref in the same format (HTML4 vs XHTML1)
+ as the test.
+
+ * CSSTestSuiteHarness/harness/harness.js:
+ (TestSuite.prototype.loadRef):
+
+2010-10-02 Simon Fraser <simon.fraser at apple.com>
+
Update the UI to reflect the fact that each test needs to be tested
in both HTML4 and XHTML1 format.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list