From 4cc4e210b49e4b381869ea87c6646a2a9e772346 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 16 Apr 2015 11:09:55 +0200 Subject: [PATCH] Move disabled content tests under wpt. --- .../test_document_characterSet_long.html.disabled | 15 --------------- ...test_document_characterSet_short.html.disabled | 15 --------------- tests/wpt/mozilla/meta/MANIFEST.json | 12 ++++++++++++ .../mozilla/document_characterSet_long.html.ini | 4 ++++ .../mozilla/document_characterSet_short.html.ini | 4 ++++ .../tests/mozilla/document_characterSet_long.html | 9 +++++++++ .../mozilla/document_characterSet_short.html | 9 +++++++++ 7 files changed, 38 insertions(+), 30 deletions(-) delete mode 100644 tests/content/test_document_characterSet_long.html.disabled delete mode 100644 tests/content/test_document_characterSet_short.html.disabled create mode 100644 tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini create mode 100644 tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini create mode 100644 tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html create mode 100644 tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html diff --git a/tests/content/test_document_characterSet_long.html.disabled b/tests/content/test_document_characterSet_long.html.disabled deleted file mode 100644 index abf547127a8..00000000000 --- a/tests/content/test_document_characterSet_long.html.disabled +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/tests/content/test_document_characterSet_short.html.disabled b/tests/content/test_document_characterSet_short.html.disabled deleted file mode 100644 index 358d4f8ba74..00000000000 --- a/tests/content/test_document_characterSet_short.html.disabled +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 49e66eb2618..95ccaadae16 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -111,6 +111,18 @@ "url": "/_mozilla/mozilla/document_characterSet_invalid.html" } ], + "mozilla/document_characterSet_long.html": [ + { + "path": "mozilla/document_characterSet_long.html", + "url": "/_mozilla/mozilla/document_characterSet_long.html" + } + ], + "mozilla/document_characterSet_short.html": [ + { + "path": "mozilla/document_characterSet_short.html", + "url": "/_mozilla/mozilla/document_characterSet_short.html" + } + ], "mozilla/document_compatMode_loose.html": [ { "path": "mozilla/document_compatMode_loose.html", diff --git a/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini b/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini new file mode 100644 index 00000000000..7a7178ccdbb --- /dev/null +++ b/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini @@ -0,0 +1,4 @@ +[document_characterSet_long.html] + type: testharness + [Untitled] + expected: FAIL diff --git a/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini b/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini new file mode 100644 index 00000000000..4dbc7734960 --- /dev/null +++ b/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini @@ -0,0 +1,4 @@ +[document_characterSet_short.html] + type: testharness + [Untitled] + expected: FAIL diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html new file mode 100644 index 00000000000..c420ced2770 --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html @@ -0,0 +1,9 @@ + + + + + diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html new file mode 100644 index 00000000000..c36b81d3fbe --- /dev/null +++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html @@ -0,0 +1,9 @@ + + + + +