Several editing tests that copy & paste slow down Mac WK2 EWS

https://bugs.webkit.org/show_bug.cgi?id=116681

Reviewed by Anders Carlsson.

Move editing tests that trigger copy and paste from execCommand into pasteboard.
Since NWRT uses a single instance of WebKitTestRunner to run tests in single directory,
this should mitigate the issue for now.

In the long term, we should really mock out the clipboard in WebKitTestRunner.

* editing/execCommand/4128080-2-expected.txt: Removed.
* editing/execCommand/4128080-2.html: Removed.
* editing/execCommand/5939887-expected.txt: Removed.
* editing/execCommand/5939887.html: Removed.
* editing/execCommand/copy-without-selection-expected.txt: Removed.
* editing/execCommand/copy-without-selection.html: Removed.
* editing/execCommand/paste-2.html: Removed.
* editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt: Copied from LayoutTests/editing/execCommand/5939887-expected.txt.
* editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html: Copied from LayoutTests/editing/execCommand/5939887.html.
* editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt: Copied from LayoutTests/editing/execCommand/4128080-2-expected.txt.
* editing/pasteboard/copy-inside-h1-preserves-h1.html: Copied from LayoutTests/editing/execCommand/4128080-2.html.
* editing/pasteboard/copy-without-selection-expected.txt: Copied from LayoutTests/editing/execCommand/copy-without-selection-expected.txt.
* editing/pasteboard/copy-without-selection.html: Copied from LayoutTests/editing/execCommand/copy-without-selection.html.
* editing/pasteboard/paste-2.html: Copied from LayoutTests/editing/execCommand/paste-2.html.
* platform/gtk/editing/execCommand/paste-2-expected.png: Removed.
* platform/gtk/editing/execCommand/paste-2-expected.txt: Removed.
* platform/gtk/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png.
* platform/gtk/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt.
* platform/mac/editing/execCommand/paste-2-expected.png: Removed.
* platform/mac/editing/execCommand/paste-2-expected.txt: Removed.
* platform/mac/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png.
* platform/mac/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt.
* platform/qt/editing/execCommand/paste-2-expected.png: Removed.
* platform/qt/editing/execCommand/paste-2-expected.txt: Removed.
* platform/qt/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png.
* platform/qt/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7658dc72b991aaa0b3ed6fa41cad9c804ed285cc..ef003c216ffd948a62ffe77e31836f107b95564e 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,43 @@
+2013-05-23  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Several editing tests that copy & paste slow down Mac WK2 EWS
+        https://bugs.webkit.org/show_bug.cgi?id=116681
+
+        Reviewed by Anders Carlsson.
+
+        Move editing tests that trigger copy and paste from execCommand into pasteboard.
+        Since NWRT uses a single instance of WebKitTestRunner to run tests in single directory,
+        this should mitigate the issue for now.
+
+        In the long term, we should really mock out the clipboard in WebKitTestRunner.
+
+        * editing/execCommand/4128080-2-expected.txt: Removed.
+        * editing/execCommand/4128080-2.html: Removed.
+        * editing/execCommand/5939887-expected.txt: Removed.
+        * editing/execCommand/5939887.html: Removed.
+        * editing/execCommand/copy-without-selection-expected.txt: Removed.
+        * editing/execCommand/copy-without-selection.html: Removed.
+        * editing/execCommand/paste-2.html: Removed.
+        * editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt: Copied from LayoutTests/editing/execCommand/5939887-expected.txt.
+        * editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html: Copied from LayoutTests/editing/execCommand/5939887.html.
+        * editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt: Copied from LayoutTests/editing/execCommand/4128080-2-expected.txt.
+        * editing/pasteboard/copy-inside-h1-preserves-h1.html: Copied from LayoutTests/editing/execCommand/4128080-2.html.
+        * editing/pasteboard/copy-without-selection-expected.txt: Copied from LayoutTests/editing/execCommand/copy-without-selection-expected.txt.
+        * editing/pasteboard/copy-without-selection.html: Copied from LayoutTests/editing/execCommand/copy-without-selection.html.
+        * editing/pasteboard/paste-2.html: Copied from LayoutTests/editing/execCommand/paste-2.html.
+        * platform/gtk/editing/execCommand/paste-2-expected.png: Removed.
+        * platform/gtk/editing/execCommand/paste-2-expected.txt: Removed.
+        * platform/gtk/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png.
+        * platform/gtk/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt.
+        * platform/mac/editing/execCommand/paste-2-expected.png: Removed.
+        * platform/mac/editing/execCommand/paste-2-expected.txt: Removed.
+        * platform/mac/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png.
+        * platform/mac/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt.
+        * platform/qt/editing/execCommand/paste-2-expected.png: Removed.
+        * platform/qt/editing/execCommand/paste-2-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png.
+        * platform/qt/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt.
+
 2013-05-23  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 
         Unreviewed, rolling out r150586.

diff --git a/LayoutTests/editing/execCommand/5939887-expected.txt b/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt
similarity index 100%
rename from LayoutTests/editing/execCommand/5939887-expected.txt
rename to LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt

diff --git a/LayoutTests/editing/execCommand/5939887.html b/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html
similarity index 100%
rename from LayoutTests/editing/execCommand/5939887.html
rename to LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html

diff --git a/LayoutTests/editing/execCommand/4128080-2-expected.txt b/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt
similarity index 100%
rename from LayoutTests/editing/execCommand/4128080-2-expected.txt
rename to LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt

diff --git a/LayoutTests/editing/execCommand/4128080-2.html b/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1.html
similarity index 100%
rename from LayoutTests/editing/execCommand/4128080-2.html
rename to LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1.html

diff --git a/LayoutTests/editing/execCommand/copy-without-selection-expected.txt b/LayoutTests/editing/pasteboard/copy-without-selection-expected.txt
similarity index 100%
rename from LayoutTests/editing/execCommand/copy-without-selection-expected.txt
rename to LayoutTests/editing/pasteboard/copy-without-selection-expected.txt

diff --git a/LayoutTests/editing/execCommand/copy-without-selection.html b/LayoutTests/editing/pasteboard/copy-without-selection.html
similarity index 100%
rename from LayoutTests/editing/execCommand/copy-without-selection.html
rename to LayoutTests/editing/pasteboard/copy-without-selection.html

diff --git a/LayoutTests/editing/execCommand/paste-2.html b/LayoutTests/editing/pasteboard/paste-2.html
similarity index 100%
rename from LayoutTests/editing/execCommand/paste-2.html
rename to LayoutTests/editing/pasteboard/paste-2.html

diff --git a/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.png
similarity index 100%
rename from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png
rename to LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.png

diff --git a/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt
similarity index 100%
rename from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt
rename to LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt

diff --git a/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png b/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png
similarity index 100%
rename from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png
rename to LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png

diff --git a/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt
similarity index 100%
rename from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt
rename to LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt

diff --git a/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png b/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.png
similarity index 100%
rename from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png
rename to LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.png

diff --git a/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.txt
similarity index 100%
rename from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt
rename to LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.txt