Rearrange benchmarks

We now have a slightly better setup:
benchmarks/ (root)
    auto/ (all benchmarks for regression testing purposes)
        changes/ (old changes benchmarks, may be subject to further change)
        creation/
            ... many subdirs, per module or per type in some cases
        js/ (old js tests)
    manual/ (useful tests that are probably not useful in an automated way)
        gputhroughput/ (useful for HW evaluation)

This should let us explicitly run tests that we want to run in an
automated fashion (good), and provides us with a bit more organization
to allow for much more tests without looking like a disorganized mess.

No new tests as yet, but they will come...

Change-Id: I93d04fca84a7f0f10999691ebe0719c80265c852
Reviewed-by: Gunnar Sletta <gunnar@crimson.no>

54 files changed, 6 insertions, 6 deletions

diff --git a/benchmark/images/moving-images-animations.qml b/benchmarks/auto/animations/comparison/moving-images-animations.qml
index 6e5f280..88e1901 100644
--- a/benchmark/images/moving-images-animations.qml
+++ b/benchmarks/auto/animations/comparison/moving-images-animations.qml
@@ -15,7 +15,7 @@ Item {
         Repeater {
             model: root.count
             Image {
-                source: "../butterfly-wide.png"
+                source: "../../../../shared/butterfly-wide.png"
                 sourceSize: Qt.size(root.size, root.size);
                 SequentialAnimation on rotation {
                     PauseAnimation { duration: 200 + Math.random() * 200 }
diff --git a/benchmark/images/moving-images-animators.qml b/benchmarks/auto/animations/comparison/moving-images-animators.qml
index 2e213e0..95cb4a3 100644
--- a/benchmark/images/moving-images-animators.qml
+++ b/benchmarks/auto/animations/comparison/moving-images-animators.qml
@@ -15,7 +15,7 @@ Item {
         Repeater {
             model: root.count
             Image {
-                source: "../butterfly-wide.png"
+                source: "../../../../shared/butterfly-wide.png"
                 sourceSize: Qt.size(root.size, root.size);
                 SequentialAnimation on rotation {
                     PauseAnimation { duration: 200 + Math.random() * 200 }
diff --git a/benchmark/images/moving-images-script.qml b/benchmarks/auto/animations/comparison/moving-images-script.qml
index f1e9f72..37b88f1 100644
--- a/benchmark/images/moving-images-script.qml
+++ b/benchmarks/auto/animations/comparison/moving-images-script.qml
@@ -16,7 +16,7 @@ Item {
         Repeater {
             model: root.count
             Image {
-                source: "../butterfly-wide.png"
+                source: "../../../../shared/butterfly-wide.png"
                 sourceSize: Qt.size(root.size, root.size);
 
                 property real t;
diff --git a/benchmark/changes/changing_over_isolated.qml b/benchmarks/auto/changes/changing_over_isolated.qml
index ab18ecb..ab18ecb 100644
--- a/benchmark/changes/changing_over_isolated.qml
+++ b/benchmarks/auto/changes/changing_over_isolated.qml
diff --git a/benchmark/changes/changing_over_isolated_with_clip.qml b/benchmarks/auto/changes/changing_over_isolated_with_clip.qml
index cb7a45e..cb7a45e 100644
--- a/benchmark/changes/changing_over_isolated_with_clip.qml
+++ b/benchmarks/auto/changes/changing_over_isolated_with_clip.qml
diff --git a/benchmark/changes/changing_over_isolated_with_clip_rotated.qml b/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml
index 7c2d085..7c2d085 100644
--- a/benchmark/changes/changing_over_isolated_with_clip_rotated.qml
+++ b/benchmarks/auto/changes/changing_over_isolated_with_clip_rotated.qml
diff --git a/benchmark/changes/changing_text_oneofmany.qml b/benchmarks/auto/changes/changing_text_oneofmany.qml
index 137b828..137b828 100644
--- a/benchmark/changes/changing_text_oneofmany.qml
+++ b/benchmarks/auto/changes/changing_text_oneofmany.qml
diff --git a/benchmark/changes/changing_textcanvas.qml b/benchmarks/auto/changes/changing_textcanvas.qml
index 58094e1..58094e1 100644
--- a/benchmark/changes/changing_textcanvas.qml
+++ b/benchmarks/auto/changes/changing_textcanvas.qml
diff --git a/benchmark/changes/changing_texts.qml b/benchmarks/auto/changes/changing_texts.qml
index d581803..d581803 100644
--- a/benchmark/changes/changing_texts.qml
+++ b/benchmarks/auto/changes/changing_texts.qml
diff --git a/benchmark/creation/delegates_buttoncontrol.qml b/benchmarks/auto/creation/controls/delegates_buttoncontrol.qml
index 9eb1dbb..9eb1dbb 100644
--- a/benchmark/creation/delegates_buttoncontrol.qml
+++ b/benchmarks/auto/creation/controls/delegates_buttoncontrol.qml
diff --git a/benchmark/creation/delegates_buttoncontrol2.qml b/benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml
index 68626f2..68626f2 100644
--- a/benchmark/creation/delegates_buttoncontrol2.qml
+++ b/benchmarks/auto/creation/controls/delegates_buttoncontrol2.qml
diff --git a/benchmark/creation/delegates_labelcontrol.qml b/benchmarks/auto/creation/controls/delegates_labelcontrol.qml
index 4056a21..4056a21 100644
--- a/benchmark/creation/delegates_labelcontrol.qml
+++ b/benchmarks/auto/creation/controls/delegates_labelcontrol.qml
diff --git a/benchmark/creation/delegates_labelcontrol2.qml b/benchmarks/auto/creation/controls/delegates_labelcontrol2.qml
index fbde27e..fbde27e 100644
--- a/benchmark/creation/delegates_labelcontrol2.qml
+++ b/benchmarks/auto/creation/controls/delegates_labelcontrol2.qml
diff --git a/benchmark/creation/delegates_complex.qml b/benchmarks/auto/creation/examples/delegates_complex.qml
index f78943a..f78943a 100644
--- a/benchmark/creation/delegates_complex.qml
+++ b/benchmarks/auto/creation/examples/delegates_complex.qml
diff --git a/benchmark/creation/delegates_tworects.qml b/benchmarks/auto/creation/examples/delegates_tworects.qml
index d171665..d171665 100644
--- a/benchmark/creation/delegates_tworects.qml
+++ b/benchmarks/auto/creation/examples/delegates_tworects.qml
diff --git a/benchmark/creation/delegates_column.qml b/benchmarks/auto/creation/layouts/delegates_column.qml
index db1eee9..db1eee9 100644
--- a/benchmark/creation/delegates_column.qml
+++ b/benchmarks/auto/creation/layouts/delegates_column.qml
diff --git a/benchmark/creation/delegates_columnlayout.qml b/benchmarks/auto/creation/layouts/delegates_columnlayout.qml
index 166089f..166089f 100644
--- a/benchmark/creation/delegates_columnlayout.qml
+++ b/benchmarks/auto/creation/layouts/delegates_columnlayout.qml
diff --git a/benchmark/creation/delegates_flow.qml b/benchmarks/auto/creation/layouts/delegates_flow.qml
index c38161c..c38161c 100644
--- a/benchmark/creation/delegates_flow.qml
+++ b/benchmarks/auto/creation/layouts/delegates_flow.qml
diff --git a/benchmark/creation/delegates_grid.qml b/benchmarks/auto/creation/layouts/delegates_grid.qml
index e30df75..e30df75 100644
--- a/benchmark/creation/delegates_grid.qml
+++ b/benchmarks/auto/creation/layouts/delegates_grid.qml
diff --git a/benchmark/creation/delegates_gridlayout.qml b/benchmarks/auto/creation/layouts/delegates_gridlayout.qml
index 2bf22b7..2bf22b7 100644
--- a/benchmark/creation/delegates_gridlayout.qml
+++ b/benchmarks/auto/creation/layouts/delegates_gridlayout.qml
diff --git a/benchmark/creation/delegates_row.qml b/benchmarks/auto/creation/layouts/delegates_row.qml
index 1bcf1c2..1bcf1c2 100644
--- a/benchmark/creation/delegates_row.qml
+++ b/benchmarks/auto/creation/layouts/delegates_row.qml
diff --git a/benchmark/creation/delegates_rowlayout.qml b/benchmarks/auto/creation/layouts/delegates_rowlayout.qml
index d4356b7..d4356b7 100644
--- a/benchmark/creation/delegates_rowlayout.qml
+++ b/benchmarks/auto/creation/layouts/delegates_rowlayout.qml
diff --git a/benchmark/creation/delegates_image.qml b/benchmarks/auto/creation/quick.image/delegates_image.qml
index a5768f0..d01ffe2 100644
--- a/benchmark/creation/delegates_image.qml
+++ b/benchmarks/auto/creation/quick.image/delegates_image.qml
@@ -25,7 +25,7 @@ Item {
         Image {
             x: Math.random() * (root.width - width)
             y: Math.random() * (root.height - height)
-            source: "../" + root.names[index % 3];
+            source: "../../../../shared/" + root.names[index % 3];
             width: 20
             height: 20
 
diff --git a/benchmark/creation/delegates_longtext.qml b/benchmarks/auto/creation/quick.text/delegates_longtext.qml
index fafa6fa..fafa6fa 100644
--- a/benchmark/creation/delegates_longtext.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_longtext.qml
diff --git a/benchmark/creation/delegates_longtext_chinese.qml b/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml
index 479a6dd..479a6dd 100644
--- a/benchmark/creation/delegates_longtext_chinese.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_longtext_chinese.qml
diff --git a/benchmark/creation/delegates_text.qml b/benchmarks/auto/creation/quick.text/delegates_text.qml
index 0f52ac3..0f52ac3 100644
--- a/benchmark/creation/delegates_text.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text.qml
diff --git a/benchmark/creation/delegates_text_chinese.qml b/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml
index 15ec620..15ec620 100644
--- a/benchmark/creation/delegates_text_chinese.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text_chinese.qml
diff --git a/benchmark/creation/delegates_text_nativerendering.qml b/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml
index f632786..f632786 100644
--- a/benchmark/creation/delegates_text_nativerendering.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text_nativerendering.qml
diff --git a/benchmark/creation/delegates_text_plain.qml b/benchmarks/auto/creation/quick.text/delegates_text_plain.qml
index ccda69c..ccda69c 100644
--- a/benchmark/creation/delegates_text_plain.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text_plain.qml
diff --git a/benchmark/creation/delegates_text_richtext.qml b/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml
index 25aaa7f..25aaa7f 100644
--- a/benchmark/creation/delegates_text_richtext.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text_richtext.qml
diff --git a/benchmark/creation/delegates_text_styled.qml b/benchmarks/auto/creation/quick.text/delegates_text_styled.qml
index aa5b670..aa5b670 100644
--- a/benchmark/creation/delegates_text_styled.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_text_styled.qml
diff --git a/benchmark/creation/delegates_textedit.qml b/benchmarks/auto/creation/quick.text/delegates_textedit.qml
index e3c20a2..e3c20a2 100644
--- a/benchmark/creation/delegates_textedit.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_textedit.qml
diff --git a/benchmark/creation/delegates_textinput.qml b/benchmarks/auto/creation/quick.text/delegates_textinput.qml
index 94fa548..94fa548 100644
--- a/benchmark/creation/delegates_textinput.qml
+++ b/benchmarks/auto/creation/quick.text/delegates_textinput.qml
diff --git a/benchmark/creation/delegates_blendedrect.qml b/benchmarks/auto/creation/quick/delegates_blendedrect.qml
index f767b28..f767b28 100644
--- a/benchmark/creation/delegates_blendedrect.qml
+++ b/benchmarks/auto/creation/quick/delegates_blendedrect.qml
diff --git a/benchmark/creation/delegates_item.qml b/benchmarks/auto/creation/quick/delegates_item.qml
index 944fe9e..944fe9e 100644
--- a/benchmark/creation/delegates_item.qml
+++ b/benchmarks/auto/creation/quick/delegates_item.qml
diff --git a/benchmark/creation/delegates_item_empty.qml b/benchmarks/auto/creation/quick/delegates_item_empty.qml
index f8d8607..f8d8607 100644
--- a/benchmark/creation/delegates_item_empty.qml
+++ b/benchmarks/auto/creation/quick/delegates_item_empty.qml
diff --git a/benchmark/creation/delegates_item_empty_jscreation.qml b/benchmarks/auto/creation/quick/delegates_item_empty_jscreation.qml
index 0afa7ee..0afa7ee 100644
--- a/benchmark/creation/delegates_item_empty_jscreation.qml
+++ b/benchmarks/auto/creation/quick/delegates_item_empty_jscreation.qml
diff --git a/benchmark/creation/delegates_qobject.qml b/benchmarks/auto/creation/quick/delegates_qobject.qml
index b7ee533..b7ee533 100644
--- a/benchmark/creation/delegates_qobject.qml
+++ b/benchmarks/auto/creation/quick/delegates_qobject.qml
diff --git a/benchmark/creation/delegates_rect.qml b/benchmarks/auto/creation/quick/delegates_rect.qml
index 9c4fea0..9c4fea0 100644
--- a/benchmark/creation/delegates_rect.qml
+++ b/benchmarks/auto/creation/quick/delegates_rect.qml
diff --git a/benchmark/creation/delegates_rect_anchor_parent.qml b/benchmarks/auto/creation/quick/delegates_rect_anchor_parent.qml
index 1f0ea6f..1f0ea6f 100644
--- a/benchmark/creation/delegates_rect_anchor_parent.qml
+++ b/benchmarks/auto/creation/quick/delegates_rect_anchor_parent.qml
diff --git a/benchmark/creation/delegates_rect_size_parent.qml b/benchmarks/auto/creation/quick/delegates_rect_size_parent.qml
index 53789bb..53789bb 100644
--- a/benchmark/creation/delegates_rect_size_parent.qml
+++ b/benchmarks/auto/creation/quick/delegates_rect_size_parent.qml
diff --git a/benchmark/creation/delegates_script.qml b/benchmarks/auto/creation/quick/delegates_script.qml
index 7e6c749..7e6c749 100644
--- a/benchmark/creation/delegates_script.qml
+++ b/benchmarks/auto/creation/quick/delegates_script.qml
diff --git a/benchmark/js/fib10.qml b/benchmarks/auto/js/fib10.qml
index 5f39ec6..5f39ec6 100644
--- a/benchmark/js/fib10.qml
+++ b/benchmarks/auto/js/fib10.qml
diff --git a/benchmark/js/sum10k.qml b/benchmarks/auto/js/sum10k.qml
index 02d7872..02d7872 100644
--- a/benchmark/js/sum10k.qml
+++ b/benchmarks/auto/js/sum10k.qml
diff --git a/benchmark/gputhroughput/blendedrect.qml b/benchmarks/manual/gputhroughput/blendedrect.qml
index 6fa2e00..6fa2e00 100644
--- a/benchmark/gputhroughput/blendedrect.qml
+++ b/benchmarks/manual/gputhroughput/blendedrect.qml
diff --git a/benchmark/gputhroughput/blendedtexture.qml b/benchmarks/manual/gputhroughput/blendedtexture.qml
index bac0265..bac0265 100644
--- a/benchmark/gputhroughput/blendedtexture.qml
+++ b/benchmarks/manual/gputhroughput/blendedtexture.qml
diff --git a/benchmark/gputhroughput/drawcalls.qml b/benchmarks/manual/gputhroughput/drawcalls.qml
index e64cfe4..7d9a14b 100644
--- a/benchmark/gputhroughput/drawcalls.qml
+++ b/benchmarks/manual/gputhroughput/drawcalls.qml
@@ -26,7 +26,7 @@ Item {
                     width: x + 2
                     height: y + 2
                     sourceSize: Qt.size(width, height);
-                    source: "../butterfly-wide.png"
+                    source: "../../../shared/butterfly-wide.png"
                 }
             }
         }
diff --git a/benchmark/gputhroughput/gaussblur.qml b/benchmarks/manual/gputhroughput/gaussblur.qml
index 63de800..bb96147 100644
--- a/benchmark/gputhroughput/gaussblur.qml
+++ b/benchmarks/manual/gputhroughput/gaussblur.qml
@@ -14,7 +14,7 @@ Item {
         id: contentRoot
         anchors.fill: parent
         fillMode: Image.PreserveAspectCrop
-        source: "../grapes.jpg"
+        source: "grapes.jpg"
         Rectangle {
             color: "palegreen"
             border.color: "black"
diff --git a/benchmark/grapes.jpg b/benchmarks/manual/gputhroughput/grapes.jpg
index a6c2213..a6c2213 100755
--- a/benchmark/grapes.jpg
+++ b/benchmarks/manual/gputhroughput/grapes.jpg
diff --git a/benchmark/gputhroughput/opaquerect.qml b/benchmarks/manual/gputhroughput/opaquerect.qml
index 641e188..641e188 100644
--- a/benchmark/gputhroughput/opaquerect.qml
+++ b/benchmarks/manual/gputhroughput/opaquerect.qml
diff --git a/benchmark/gputhroughput/opaquetexture.qml b/benchmarks/manual/gputhroughput/opaquetexture.qml
index 483903a..483903a 100644
--- a/benchmark/gputhroughput/opaquetexture.qml
+++ b/benchmarks/manual/gputhroughput/opaquetexture.qml
diff --git a/benchmark/butterfly-collapsed.png b/shared/butterfly-collapsed.png
index 93f8933..93f8933 100644
--- a/benchmark/butterfly-collapsed.png
+++ b/shared/butterfly-collapsed.png
diff --git a/benchmark/butterfly-half.png b/shared/butterfly-half.png
index d601f17..d601f17 100644
--- a/benchmark/butterfly-half.png
+++ b/shared/butterfly-half.png
diff --git a/benchmark/butterfly-wide.png b/shared/butterfly-wide.png
index 0899407..0899407 100644
--- a/benchmark/butterfly-wide.png
+++ b/shared/butterfly-wide.png