From ce36a5ae938100bc19084a6ce7db5f8eb38dda3b Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 23 Aug 2010 12:58:04 +0100 Subject: Fix location of several Android-specific LayoutTest expected results These results were previsouly duplicated in the JSC and V8-specific directories. This change moves them to the general android directory. Change-Id: I65c7db3759f91b62502e8f5b2c8673305f05d0f5 --- .../dom/Geolocation/callback-to-deleted-context-expected.txt | 10 ---------- .../fast/dom/Geolocation/notimer-after-unload-expected.txt | 2 -- .../android-jsc/http/tests/appcache/local-content-expected.txt | 6 ------ .../dom/Geolocation/callback-to-deleted-context-expected.txt | 10 ---------- .../fast/dom/Geolocation/notimer-after-unload-expected.txt | 2 -- .../android-v8/http/tests/appcache/local-content-expected.txt | 6 ------ .../dom/Geolocation/callback-to-deleted-context-expected.txt | 10 ++++++++++ .../fast/dom/Geolocation/notimer-after-unload-expected.txt | 2 ++ .../android/http/tests/appcache/local-content-expected.txt | 6 ++++++ 9 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt delete mode 100644 LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt delete mode 100644 LayoutTests/platform/android-jsc/http/tests/appcache/local-content-expected.txt delete mode 100644 LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt delete mode 100644 LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt delete mode 100644 LayoutTests/platform/android-v8/http/tests/appcache/local-content-expected.txt create mode 100644 LayoutTests/platform/android/fast/dom/Geolocation/callback-to-deleted-context-expected.txt create mode 100644 LayoutTests/platform/android/fast/dom/Geolocation/notimer-after-unload-expected.txt create mode 100644 LayoutTests/platform/android/http/tests/appcache/local-content-expected.txt (limited to 'LayoutTests/platform') diff --git a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt deleted file mode 100644 index 5b4fd95..0000000 --- a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/callback-to-deleted-context-expected.txt +++ /dev/null @@ -1,10 +0,0 @@ -Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS No callbacks invoked -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt deleted file mode 100644 index 77f5ce9..0000000 --- a/LayoutTests/platform/android-jsc/fast/dom/Geolocation/notimer-after-unload-expected.txt +++ /dev/null @@ -1,2 +0,0 @@ -ALERT: unload-called -You should have seen one unload alert appear. diff --git a/LayoutTests/platform/android-jsc/http/tests/appcache/local-content-expected.txt b/LayoutTests/platform/android-jsc/http/tests/appcache/local-content-expected.txt deleted file mode 100644 index b748094..0000000 --- a/LayoutTests/platform/android-jsc/http/tests/appcache/local-content-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CONSOLE MESSAGE: line 0: Not allowed to load local resource: file:///usr/include/stdio.h -Test that documents loaded from application cache don't get access to local resources accidentally. - -Should say SUCCESS: - -SUCCESS diff --git a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt deleted file mode 100644 index 5b4fd95..0000000 --- a/LayoutTests/platform/android-v8/fast/dom/Geolocation/callback-to-deleted-context-expected.txt +++ /dev/null @@ -1,10 +0,0 @@ -Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS No callbacks invoked -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt deleted file mode 100644 index 77f5ce9..0000000 --- a/LayoutTests/platform/android-v8/fast/dom/Geolocation/notimer-after-unload-expected.txt +++ /dev/null @@ -1,2 +0,0 @@ -ALERT: unload-called -You should have seen one unload alert appear. diff --git a/LayoutTests/platform/android-v8/http/tests/appcache/local-content-expected.txt b/LayoutTests/platform/android-v8/http/tests/appcache/local-content-expected.txt deleted file mode 100644 index b748094..0000000 --- a/LayoutTests/platform/android-v8/http/tests/appcache/local-content-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CONSOLE MESSAGE: line 0: Not allowed to load local resource: file:///usr/include/stdio.h -Test that documents loaded from application cache don't get access to local resources accidentally. - -Should say SUCCESS: - -SUCCESS diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/callback-to-deleted-context-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/callback-to-deleted-context-expected.txt new file mode 100644 index 0000000..5b4fd95 --- /dev/null +++ b/LayoutTests/platform/android/fast/dom/Geolocation/callback-to-deleted-context-expected.txt @@ -0,0 +1,10 @@ +Tests that when a Geolocation request is made from a remote frame, and that frame's script context goes away before the Geolocation callback is made, the callback is not made. If the callback is attempted, a crash will occur. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS No callbacks invoked +PASS successfullyParsed is true + +TEST COMPLETE + diff --git a/LayoutTests/platform/android/fast/dom/Geolocation/notimer-after-unload-expected.txt b/LayoutTests/platform/android/fast/dom/Geolocation/notimer-after-unload-expected.txt new file mode 100644 index 0000000..77f5ce9 --- /dev/null +++ b/LayoutTests/platform/android/fast/dom/Geolocation/notimer-after-unload-expected.txt @@ -0,0 +1,2 @@ +ALERT: unload-called +You should have seen one unload alert appear. diff --git a/LayoutTests/platform/android/http/tests/appcache/local-content-expected.txt b/LayoutTests/platform/android/http/tests/appcache/local-content-expected.txt new file mode 100644 index 0000000..b748094 --- /dev/null +++ b/LayoutTests/platform/android/http/tests/appcache/local-content-expected.txt @@ -0,0 +1,6 @@ +CONSOLE MESSAGE: line 0: Not allowed to load local resource: file:///usr/include/stdio.h +Test that documents loaded from application cache don't get access to local resources accidentally. + +Should say SUCCESS: + +SUCCESS -- cgit v1.1