Move two ios-sim-deprecated/animations/ tests into animations.

* animations/resources/anim.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html.
* animations/restart-after-scroll-expected.txt: Copied from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
* animations/restart-after-scroll-nested-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
* animations/restart-after-scroll-nested.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html.
* animations/restart-after-scroll.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html.
* platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt: Removed.
* platform/ios-simulator-wk1/TestExpectations:
* platform/ios-simulator-wk2/TestExpectations:
* platform/ios-simulator/TestExpectations:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 14655dcf350f88d88adcf888f9d16062a963bd92..af90ccd9fbead04c9c3466b2dc6690e490e72fe1 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2015-08-06  Simon Fraser  <simon.fraser@apple.com>
+
+        Move two ios-sim-deprecated/animations/ tests into animations.
+
+        * animations/resources/anim.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html.
+        * animations/restart-after-scroll-expected.txt: Copied from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
+        * animations/restart-after-scroll-nested-expected.txt: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt.
+        * animations/restart-after-scroll-nested.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html.
+        * animations/restart-after-scroll.html: Renamed from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html.
+        * platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt: Removed.
+        * platform/ios-simulator-wk1/TestExpectations:
+        * platform/ios-simulator-wk2/TestExpectations:
+        * platform/ios-simulator/TestExpectations:
+
 2015-08-07  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 
         [Streams API] Create CountQueuingStrategy object as per spec

diff --git a/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html b/LayoutTests/animations/resources/anim.html
similarity index 90%
rename from LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html
rename to LayoutTests/animations/resources/anim.html
index f299cba0aa07591569b125d0bbf69c3c2134aca9..cebcf31669fa6ce57682f1f184b43be00fa38b01 100644 (file)
--- a/LayoutTests/platform/ios-sim-deprecated/animations/resources/anim.html
+++ b/LayoutTests/animations/resources/anim.html
@@ -1,4 +1,3 @@
-<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
 <style>
 @-webkit-keyframes bounce {
     from {

diff --git a/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt b/LayoutTests/animations/restart-after-scroll-expected.txt
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested-expected.txt
rename to LayoutTests/animations/restart-after-scroll-expected.txt

diff --git a/LayoutTests/animations/restart-after-scroll-nested-expected.txt b/LayoutTests/animations/restart-after-scroll-nested-expected.txt
new file mode 100644 (file)
index 0000000..9480ca1
--- /dev/null
+++ b/LayoutTests/animations/restart-after-scroll-nested-expected.txt
@@ -0,0 +1,2 @@
+
+PASS: Saw iteration after scrolling

diff --git a/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html b/LayoutTests/animations/restart-after-scroll-nested.html
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-nested.html
rename to LayoutTests/animations/restart-after-scroll-nested.html

diff --git a/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html b/LayoutTests/animations/restart-after-scroll.html
similarity index 100%
rename from LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll.html
rename to LayoutTests/animations/restart-after-scroll.html

diff --git a/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt b/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt
deleted file mode 100644 (file)
index 6ee3f71..0000000
--- a/LayoutTests/platform/ios-sim-deprecated/animations/restart-after-scroll-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-FAIL: Timed out waiting for notifyDone to be called
-

diff --git a/LayoutTests/platform/ios-simulator-wk1/TestExpectations b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
index 146bb3e1f70a4117415e0afbdb39d69444f7695f..aa67970647b081c1a39923c454f05c994be6a77f 100644 (file)
--- a/LayoutTests/platform/ios-simulator-wk1/TestExpectations
+++ b/LayoutTests/platform/ios-simulator-wk1/TestExpectations
@@ -1428,8 +1428,8 @@ security/block-test-no-port.html
 security/block-test.html
 
 # Animation tests that fail:
-animations/combo-transform-translate+scale.html [ Failure ]
-animations/suspend-resume-animation-events.html [ Failure ]
+animations/combo-transform-translate+scale.html [ Pass Failure ]
+animations/suspend-resume-animation-events.html [ Pass Failure ]
 
 # IndexedDB is not supported on iOS WK1.
 storage/indexeddb

diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
index c25f79bcb768646cade90e33a70fdf8ff6188206..f10208007b9f48e8e3d114044668333604a8c2bc 100644 (file)
--- a/LayoutTests/platform/ios-simulator-wk2/TestExpectations
+++ b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
@@ -5,8 +5,8 @@
 # Animation tests that fail:
 webkit.org/b/129562 [ Debug ] animations/animation-direction-reverse-fill-mode.html [ Skip ]
 webkit.org/b/129562 [ Debug ] animations/fill-mode-reverse.html [ Skip ]
-animations/additive-transform-animations.html [ Failure ]
-animations/play-state-paused.html [ Failure ]
+animations/additive-transform-animations.html [ Pass Failure ]
+animations/play-state-paused.html [ Pass Failure ]
 
 # Animation tests that time out:
 animations/animation-direction-normal.html

diff --git a/LayoutTests/platform/ios-simulator/TestExpectations b/LayoutTests/platform/ios-simulator/TestExpectations
index 186821277b9df15bdcfbb8c114efd5f04c46a984..9a5b5ccd4f73d6877942b22bbe0fedd087ea5ee9 100644 (file)
--- a/LayoutTests/platform/ios-simulator/TestExpectations
+++ b/LayoutTests/platform/ios-simulator/TestExpectations
@@ -287,10 +287,10 @@ fast/layers/no-clipping-overflow-hidden-added-after-transform.html
 # Animation tests that fail:
 animations/cross-fade-background-image.html [ ImageOnlyFailure ]
 animations/cross-fade-webkit-mask-box-image.html [ Failure ]
-animations/play-state-suspend.html [ Failure ]
-animations/suspend-resume-animation.html [ Failure ]
-animations/unprefixed-events-mixed-with-prefixed.html [ Failure ]
-animations/unprefixed-events.html [ Failure ]
+animations/play-state-suspend.html [ Pass Failure ]
+animations/suspend-resume-animation.html [ Pass Failure ]
+animations/unprefixed-events-mixed-with-prefixed.html [ Pass Failure ]
+animations/unprefixed-events.html [ Pass Failure ]
 
 # Animation tests that are flaky:
 animations/3d/matrix-transform-type-animation.html [ Skip ] # Pass, Timeout, Missing