133 files changed, 4 insertions, 3 deletions
diff --git a/clutter/meson.build b/clutter/meson.build
index bd9f06e74..298d6f177 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -86,6 +86,3 @@ clutter_deps = [
 
 subdir('clutter')
 
-#if have_clutter_tests
-#  subdir('tests')
-#endif
diff --git a/clutter/tests/README b/src/tests/clutter/README
index b5665e6ab..b5665e6ab 100644
--- a/clutter/tests/README
+++ b/src/tests/clutter/README
diff --git a/clutter/tests/accessibility/.gitignore b/src/tests/clutter/accessibility/.gitignore
index 2b1a0b151..2b1a0b151 100644
--- a/clutter/tests/accessibility/.gitignore
+++ b/src/tests/clutter/accessibility/.gitignore
diff --git a/clutter/tests/accessibility/cally-atkcomponent-example.c b/src/tests/clutter/accessibility/cally-atkcomponent-example.c
index 79a816bde..79a816bde 100644
--- a/clutter/tests/accessibility/cally-atkcomponent-example.c
+++ b/src/tests/clutter/accessibility/cally-atkcomponent-example.c
diff --git a/clutter/tests/accessibility/cally-atkeditabletext-example.c b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c
index 433ee9270..433ee9270 100644
--- a/clutter/tests/accessibility/cally-atkeditabletext-example.c
+++ b/src/tests/clutter/accessibility/cally-atkeditabletext-example.c
diff --git a/clutter/tests/accessibility/cally-atkevents-example.c b/src/tests/clutter/accessibility/cally-atkevents-example.c
index 6740cb80f..6740cb80f 100644
--- a/clutter/tests/accessibility/cally-atkevents-example.c
+++ b/src/tests/clutter/accessibility/cally-atkevents-example.c
diff --git a/clutter/tests/accessibility/cally-atktext-example.c b/src/tests/clutter/accessibility/cally-atktext-example.c
index 634a9a74f..634a9a74f 100644
--- a/clutter/tests/accessibility/cally-atktext-example.c
+++ b/src/tests/clutter/accessibility/cally-atktext-example.c
diff --git a/clutter/tests/accessibility/cally-clone-example.c b/src/tests/clutter/accessibility/cally-clone-example.c
index 9cc2d6856..9cc2d6856 100644
--- a/clutter/tests/accessibility/cally-clone-example.c
+++ b/src/tests/clutter/accessibility/cally-clone-example.c
diff --git a/clutter/tests/accessibility/cally-examples-util.c b/src/tests/clutter/accessibility/cally-examples-util.c
index ea3e31aa7..ea3e31aa7 100644
--- a/clutter/tests/accessibility/cally-examples-util.c
+++ b/src/tests/clutter/accessibility/cally-examples-util.c
diff --git a/clutter/tests/accessibility/cally-examples-util.h b/src/tests/clutter/accessibility/cally-examples-util.h
index dab5926cc..dab5926cc 100644
--- a/clutter/tests/accessibility/cally-examples-util.h
+++ b/src/tests/clutter/accessibility/cally-examples-util.h
diff --git a/clutter/tests/accessibility/meson.build b/src/tests/clutter/accessibility/meson.build
index fe9732efc..fe9732efc 100644
--- a/clutter/tests/accessibility/meson.build
+++ b/src/tests/clutter/accessibility/meson.build
diff --git a/clutter/tests/clutter-1.0.suppressions b/src/tests/clutter/clutter-1.0.suppressions
index f47498d16..f47498d16 100644
--- a/clutter/tests/clutter-1.0.suppressions
+++ b/src/tests/clutter/clutter-1.0.suppressions
diff --git a/clutter/tests/conform/actor-anchors.c b/src/tests/clutter/conform/actor-anchors.c
index 55395880b..55395880b 100644
--- a/clutter/tests/conform/actor-anchors.c
+++ b/src/tests/clutter/conform/actor-anchors.c
diff --git a/clutter/tests/conform/actor-destroy.c b/src/tests/clutter/conform/actor-destroy.c
index 10ad79df7..10ad79df7 100644
--- a/clutter/tests/conform/actor-destroy.c
+++ b/src/tests/clutter/conform/actor-destroy.c
diff --git a/clutter/tests/conform/actor-graph.c b/src/tests/clutter/conform/actor-graph.c
index 8fbf4bcb7..8fbf4bcb7 100644
--- a/clutter/tests/conform/actor-graph.c
+++ b/src/tests/clutter/conform/actor-graph.c
diff --git a/clutter/tests/conform/actor-invariants.c b/src/tests/clutter/conform/actor-invariants.c
index 87df90bc1..87df90bc1 100644
--- a/clutter/tests/conform/actor-invariants.c
+++ b/src/tests/clutter/conform/actor-invariants.c
diff --git a/clutter/tests/conform/actor-iter.c b/src/tests/clutter/conform/actor-iter.c
index 193f63b27..193f63b27 100644
--- a/clutter/tests/conform/actor-iter.c
+++ b/src/tests/clutter/conform/actor-iter.c
diff --git a/clutter/tests/conform/actor-layout.c b/src/tests/clutter/conform/actor-layout.c
index 2cc89400c..2cc89400c 100644
--- a/clutter/tests/conform/actor-layout.c
+++ b/src/tests/clutter/conform/actor-layout.c
diff --git a/clutter/tests/conform/actor-meta.c b/src/tests/clutter/conform/actor-meta.c
index 52a313d22..52a313d22 100644
--- a/clutter/tests/conform/actor-meta.c
+++ b/src/tests/clutter/conform/actor-meta.c
diff --git a/clutter/tests/conform/actor-offscreen-redirect.c b/src/tests/clutter/conform/actor-offscreen-redirect.c
index 9dbb7d2c5..9dbb7d2c5 100644
--- a/clutter/tests/conform/actor-offscreen-redirect.c
+++ b/src/tests/clutter/conform/actor-offscreen-redirect.c
diff --git a/clutter/tests/conform/actor-paint-opacity.c b/src/tests/clutter/conform/actor-paint-opacity.c
index 6df240872..6df240872 100644
--- a/clutter/tests/conform/actor-paint-opacity.c
+++ b/src/tests/clutter/conform/actor-paint-opacity.c
diff --git a/clutter/tests/conform/actor-pick.c b/src/tests/clutter/conform/actor-pick.c
index 969b4920a..969b4920a 100644
--- a/clutter/tests/conform/actor-pick.c
+++ b/src/tests/clutter/conform/actor-pick.c
diff --git a/clutter/tests/conform/actor-shader-effect.c b/src/tests/clutter/conform/actor-shader-effect.c
index ac99c5b40..ac99c5b40 100644
--- a/clutter/tests/conform/actor-shader-effect.c
+++ b/src/tests/clutter/conform/actor-shader-effect.c
diff --git a/clutter/tests/conform/actor-size.c b/src/tests/clutter/conform/actor-size.c
index 7245f157d..7245f157d 100644
--- a/clutter/tests/conform/actor-size.c
+++ b/src/tests/clutter/conform/actor-size.c
diff --git a/clutter/tests/conform/behaviours.c b/src/tests/clutter/conform/behaviours.c
index 6c531beff..6c531beff 100644
--- a/clutter/tests/conform/behaviours.c
+++ b/src/tests/clutter/conform/behaviours.c
diff --git a/clutter/tests/conform/binding-pool.c b/src/tests/clutter/conform/binding-pool.c
index 4e4752b6b..4e4752b6b 100644
--- a/clutter/tests/conform/binding-pool.c
+++ b/src/tests/clutter/conform/binding-pool.c
diff --git a/clutter/tests/conform/cairo-texture.c b/src/tests/clutter/conform/cairo-texture.c
index dd7818063..dd7818063 100644
--- a/clutter/tests/conform/cairo-texture.c
+++ b/src/tests/clutter/conform/cairo-texture.c
diff --git a/clutter/tests/conform/cally-text.c b/src/tests/clutter/conform/cally-text.c
index 32d7afb70..32d7afb70 100644
--- a/clutter/tests/conform/cally-text.c
+++ b/src/tests/clutter/conform/cally-text.c
diff --git a/clutter/tests/conform/color.c b/src/tests/clutter/conform/color.c
index 03ecf3f08..03ecf3f08 100644
--- a/clutter/tests/conform/color.c
+++ b/src/tests/clutter/conform/color.c
diff --git a/clutter/tests/conform/group.c b/src/tests/clutter/conform/group.c
index 3f7b1fb4b..3f7b1fb4b 100644
--- a/clutter/tests/conform/group.c
+++ b/src/tests/clutter/conform/group.c
diff --git a/clutter/tests/conform/interval.c b/src/tests/clutter/conform/interval.c
index 520437894..520437894 100644
--- a/clutter/tests/conform/interval.c
+++ b/src/tests/clutter/conform/interval.c
diff --git a/clutter/tests/conform/meson.build b/src/tests/clutter/conform/meson.build
index 5d0df7acd..5d0df7acd 100644
--- a/clutter/tests/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
diff --git a/clutter/tests/conform/path.c b/src/tests/clutter/conform/path.c
index b292ac9da..b292ac9da 100644
--- a/clutter/tests/conform/path.c
+++ b/src/tests/clutter/conform/path.c
diff --git a/clutter/tests/conform/rectangle.c b/src/tests/clutter/conform/rectangle.c
index 1c09f00b7..1c09f00b7 100644
--- a/clutter/tests/conform/rectangle.c
+++ b/src/tests/clutter/conform/rectangle.c
diff --git a/clutter/tests/conform/script-parser.c b/src/tests/clutter/conform/script-parser.c
index c2e2dbd08..c2e2dbd08 100644
--- a/clutter/tests/conform/script-parser.c
+++ b/src/tests/clutter/conform/script-parser.c
diff --git a/clutter/tests/conform/scripts/test-animator-1.json b/src/tests/clutter/conform/scripts/test-animator-1.json
index 2d6aab908..2d6aab908 100644
--- a/clutter/tests/conform/scripts/test-animator-1.json
+++ b/src/tests/clutter/conform/scripts/test-animator-1.json
diff --git a/clutter/tests/conform/scripts/test-animator-2.json b/src/tests/clutter/conform/scripts/test-animator-2.json
index 9059f57ed..9059f57ed 100644
--- a/clutter/tests/conform/scripts/test-animator-2.json
+++ b/src/tests/clutter/conform/scripts/test-animator-2.json
diff --git a/clutter/tests/conform/scripts/test-animator-3.json b/src/tests/clutter/conform/scripts/test-animator-3.json
index 26d779bee..26d779bee 100644
--- a/clutter/tests/conform/scripts/test-animator-3.json
+++ b/src/tests/clutter/conform/scripts/test-animator-3.json
diff --git a/clutter/tests/conform/scripts/test-script-animation.json b/src/tests/clutter/conform/scripts/test-script-animation.json
index d6ef90343..d6ef90343 100644
--- a/clutter/tests/conform/scripts/test-script-animation.json
+++ b/src/tests/clutter/conform/scripts/test-script-animation.json
diff --git a/clutter/tests/conform/scripts/test-script-child.json b/src/tests/clutter/conform/scripts/test-script-child.json
index 5e8ac5242..5e8ac5242 100644
--- a/clutter/tests/conform/scripts/test-script-child.json
+++ b/src/tests/clutter/conform/scripts/test-script-child.json
diff --git a/clutter/tests/conform/scripts/test-script-implicit-alpha.json b/src/tests/clutter/conform/scripts/test-script-implicit-alpha.json
index 5aab70d3d..5aab70d3d 100644
--- a/clutter/tests/conform/scripts/test-script-implicit-alpha.json
+++ b/src/tests/clutter/conform/scripts/test-script-implicit-alpha.json
diff --git a/clutter/tests/conform/scripts/test-script-interval.json b/src/tests/clutter/conform/scripts/test-script-interval.json
index 35fe5c22c..35fe5c22c 100644
--- a/clutter/tests/conform/scripts/test-script-interval.json
+++ b/src/tests/clutter/conform/scripts/test-script-interval.json
diff --git a/clutter/tests/conform/scripts/test-script-layout-property.json b/src/tests/clutter/conform/scripts/test-script-layout-property.json
index 17e9f4882..17e9f4882 100644
--- a/clutter/tests/conform/scripts/test-script-layout-property.json
+++ b/src/tests/clutter/conform/scripts/test-script-layout-property.json
diff --git a/clutter/tests/conform/scripts/test-script-margin.json b/src/tests/clutter/conform/scripts/test-script-margin.json
index 1f5289fa6..1f5289fa6 100644
--- a/clutter/tests/conform/scripts/test-script-margin.json
+++ b/src/tests/clutter/conform/scripts/test-script-margin.json
diff --git a/clutter/tests/conform/scripts/test-script-model.json b/src/tests/clutter/conform/scripts/test-script-model.json
index 9bd6aefc5..9bd6aefc5 100644
--- a/clutter/tests/conform/scripts/test-script-model.json
+++ b/src/tests/clutter/conform/scripts/test-script-model.json
diff --git a/clutter/tests/conform/scripts/test-script-named-object.json b/src/tests/clutter/conform/scripts/test-script-named-object.json
index 6611b62a4..6611b62a4 100644
--- a/clutter/tests/conform/scripts/test-script-named-object.json
+++ b/src/tests/clutter/conform/scripts/test-script-named-object.json
diff --git a/clutter/tests/conform/scripts/test-script-object-property.json b/src/tests/clutter/conform/scripts/test-script-object-property.json
index 18a02fb8b..18a02fb8b 100644
--- a/clutter/tests/conform/scripts/test-script-object-property.json
+++ b/src/tests/clutter/conform/scripts/test-script-object-property.json
diff --git a/clutter/tests/conform/scripts/test-script-single.json b/src/tests/clutter/conform/scripts/test-script-single.json
index e20a318df..e20a318df 100644
--- a/clutter/tests/conform/scripts/test-script-single.json
+++ b/src/tests/clutter/conform/scripts/test-script-single.json
diff --git a/clutter/tests/conform/scripts/test-script-timeline-markers.json b/src/tests/clutter/conform/scripts/test-script-timeline-markers.json
index f5fff5c42..f5fff5c42 100644
--- a/clutter/tests/conform/scripts/test-script-timeline-markers.json
+++ b/src/tests/clutter/conform/scripts/test-script-timeline-markers.json
diff --git a/clutter/tests/conform/scripts/test-state-1.json b/src/tests/clutter/conform/scripts/test-state-1.json
index 78ab5de89..78ab5de89 100644
--- a/clutter/tests/conform/scripts/test-state-1.json
+++ b/src/tests/clutter/conform/scripts/test-state-1.json
diff --git a/clutter/tests/conform/state.c b/src/tests/clutter/conform/state.c
index 7e4720dc5..7e4720dc5 100644
--- a/clutter/tests/conform/state.c
+++ b/src/tests/clutter/conform/state.c
diff --git a/clutter/tests/conform/text-cache.c b/src/tests/clutter/conform/text-cache.c
index 6b4bddf78..6b4bddf78 100644
--- a/clutter/tests/conform/text-cache.c
+++ b/src/tests/clutter/conform/text-cache.c
diff --git a/clutter/tests/conform/text.c b/src/tests/clutter/conform/text.c
index cef99023e..cef99023e 100644
--- a/clutter/tests/conform/text.c
+++ b/src/tests/clutter/conform/text.c
diff --git a/clutter/tests/conform/texture-fbo.c b/src/tests/clutter/conform/texture-fbo.c
index 4a30b383c..4a30b383c 100644
--- a/clutter/tests/conform/texture-fbo.c
+++ b/src/tests/clutter/conform/texture-fbo.c
diff --git a/clutter/tests/conform/texture.c b/src/tests/clutter/conform/texture.c
index 392fd5c47..392fd5c47 100644
--- a/clutter/tests/conform/texture.c
+++ b/src/tests/clutter/conform/texture.c
diff --git a/clutter/tests/conform/timeline-interpolate.c b/src/tests/clutter/conform/timeline-interpolate.c
index 3988c038d..3988c038d 100644
--- a/clutter/tests/conform/timeline-interpolate.c
+++ b/src/tests/clutter/conform/timeline-interpolate.c
diff --git a/clutter/tests/conform/timeline-progress.c b/src/tests/clutter/conform/timeline-progress.c
index 9c966ca8f..9c966ca8f 100644
--- a/clutter/tests/conform/timeline-progress.c
+++ b/src/tests/clutter/conform/timeline-progress.c
diff --git a/clutter/tests/conform/timeline-rewind.c b/src/tests/clutter/conform/timeline-rewind.c
index 0263649ac..0263649ac 100644
--- a/clutter/tests/conform/timeline-rewind.c
+++ b/src/tests/clutter/conform/timeline-rewind.c
diff --git a/clutter/tests/conform/timeline.c b/src/tests/clutter/conform/timeline.c
index 96bd09277..96bd09277 100644
--- a/clutter/tests/conform/timeline.c
+++ b/src/tests/clutter/conform/timeline.c
diff --git a/clutter/tests/conform/units.c b/src/tests/clutter/conform/units.c
index 06bfaf513..06bfaf513 100644
--- a/clutter/tests/conform/units.c
+++ b/src/tests/clutter/conform/units.c
diff --git a/clutter/tests/interactive/.gitignore b/src/tests/clutter/interactive/.gitignore
index 7fde7f98f..7fde7f98f 100644
--- a/clutter/tests/interactive/.gitignore
+++ b/src/tests/clutter/interactive/.gitignore
diff --git a/clutter/tests/interactive/meson.build b/src/tests/clutter/interactive/meson.build
index 4f7ddbfe6..4f7ddbfe6 100644
--- a/clutter/tests/interactive/meson.build
+++ b/src/tests/clutter/interactive/meson.build
diff --git a/clutter/tests/interactive/meson/gen-test-unit-names.sh b/src/tests/clutter/interactive/meson/gen-test-unit-names.sh
index 72c5bf362..72c5bf362 100755
--- a/clutter/tests/interactive/meson/gen-test-unit-names.sh
+++ b/src/tests/clutter/interactive/meson/gen-test-unit-names.sh
diff --git a/clutter/tests/interactive/redhand.png b/src/tests/clutter/interactive/redhand.png
index c07d8acd3..c07d8acd3 100644
--- a/clutter/tests/interactive/redhand.png
+++ b/src/tests/clutter/interactive/redhand.png
diff --git a/clutter/tests/interactive/test-actors.c b/src/tests/clutter/interactive/test-actors.c
index ae12d7a08..ae12d7a08 100644
--- a/clutter/tests/interactive/test-actors.c
+++ b/src/tests/clutter/interactive/test-actors.c
diff --git a/clutter/tests/interactive/test-animation.c b/src/tests/clutter/interactive/test-animation.c
index dbd5e5876..dbd5e5876 100644
--- a/clutter/tests/interactive/test-animation.c
+++ b/src/tests/clutter/interactive/test-animation.c
diff --git a/clutter/tests/interactive/test-bind-constraint.c b/src/tests/clutter/interactive/test-bind-constraint.c
index f8df31b02..f8df31b02 100644
--- a/clutter/tests/interactive/test-bind-constraint.c
+++ b/src/tests/clutter/interactive/test-bind-constraint.c
diff --git a/clutter/tests/interactive/test-binding-pool.c b/src/tests/clutter/interactive/test-binding-pool.c
index b33eebd42..b33eebd42 100644
--- a/clutter/tests/interactive/test-binding-pool.c
+++ b/src/tests/clutter/interactive/test-binding-pool.c
diff --git a/clutter/tests/interactive/test-cairo-clock.c b/src/tests/clutter/interactive/test-cairo-clock.c
index 931282b02..931282b02 100644
--- a/clutter/tests/interactive/test-cairo-clock.c
+++ b/src/tests/clutter/interactive/test-cairo-clock.c
diff --git a/clutter/tests/interactive/test-cairo-flowers.c b/src/tests/clutter/interactive/test-cairo-flowers.c
index 6f60784bb..6f60784bb 100644
--- a/clutter/tests/interactive/test-cairo-flowers.c
+++ b/src/tests/clutter/interactive/test-cairo-flowers.c
diff --git a/clutter/tests/interactive/test-cogl-multitexture.c b/src/tests/clutter/interactive/test-cogl-multitexture.c
index 3151b6e08..3151b6e08 100644
--- a/clutter/tests/interactive/test-cogl-multitexture.c
+++ b/src/tests/clutter/interactive/test-cogl-multitexture.c
diff --git a/clutter/tests/interactive/test-cogl-offscreen.c b/src/tests/clutter/interactive/test-cogl-offscreen.c
index 948d978fe..948d978fe 100644
--- a/clutter/tests/interactive/test-cogl-offscreen.c
+++ b/src/tests/clutter/interactive/test-cogl-offscreen.c
diff --git a/clutter/tests/interactive/test-cogl-point-sprites.c b/src/tests/clutter/interactive/test-cogl-point-sprites.c
index cd94966de..cd94966de 100644
--- a/clutter/tests/interactive/test-cogl-point-sprites.c
+++ b/src/tests/clutter/interactive/test-cogl-point-sprites.c
diff --git a/clutter/tests/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
index 22c47d0ee..22c47d0ee 100644
--- a/clutter/tests/interactive/test-cogl-shader-glsl.c
+++ b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
diff --git a/clutter/tests/interactive/test-cogl-tex-convert.c b/src/tests/clutter/interactive/test-cogl-tex-convert.c
index 0f025d703..0f025d703 100644
--- a/clutter/tests/interactive/test-cogl-tex-convert.c
+++ b/src/tests/clutter/interactive/test-cogl-tex-convert.c
diff --git a/clutter/tests/interactive/test-cogl-tex-polygon.c b/src/tests/clutter/interactive/test-cogl-tex-polygon.c
index 2bfc60ae6..2bfc60ae6 100644
--- a/clutter/tests/interactive/test-cogl-tex-polygon.c
+++ b/src/tests/clutter/interactive/test-cogl-tex-polygon.c
diff --git a/clutter/tests/interactive/test-cogl-tex-tile.c b/src/tests/clutter/interactive/test-cogl-tex-tile.c
index 09b2a445f..09b2a445f 100644
--- a/clutter/tests/interactive/test-cogl-tex-tile.c
+++ b/src/tests/clutter/interactive/test-cogl-tex-tile.c
diff --git a/clutter/tests/interactive/test-cogl-vertex-buffer.c b/src/tests/clutter/interactive/test-cogl-vertex-buffer.c
index 9683e07f3..9683e07f3 100644
--- a/clutter/tests/interactive/test-cogl-vertex-buffer.c
+++ b/src/tests/clutter/interactive/test-cogl-vertex-buffer.c
diff --git a/clutter/tests/interactive/test-content.c b/src/tests/clutter/interactive/test-content.c
index fa0ac3a2f..fa0ac3a2f 100644
--- a/clutter/tests/interactive/test-content.c
+++ b/src/tests/clutter/interactive/test-content.c
diff --git a/clutter/tests/interactive/test-devices.c b/src/tests/clutter/interactive/test-devices.c
index c9644eb25..c9644eb25 100644
--- a/clutter/tests/interactive/test-devices.c
+++ b/src/tests/clutter/interactive/test-devices.c
diff --git a/clutter/tests/interactive/test-easing.c b/src/tests/clutter/interactive/test-easing.c
index 3a66b36f9..3a66b36f9 100644
--- a/clutter/tests/interactive/test-easing.c
+++ b/src/tests/clutter/interactive/test-easing.c
diff --git a/clutter/tests/interactive/test-events.c b/src/tests/clutter/interactive/test-events.c
index 013231ef8..013231ef8 100644
--- a/clutter/tests/interactive/test-events.c
+++ b/src/tests/clutter/interactive/test-events.c
diff --git a/clutter/tests/interactive/test-fbo.c b/src/tests/clutter/interactive/test-fbo.c
index 9ba22c79b..9ba22c79b 100644
--- a/clutter/tests/interactive/test-fbo.c
+++ b/src/tests/clutter/interactive/test-fbo.c
diff --git a/clutter/tests/interactive/test-grab.c b/src/tests/clutter/interactive/test-grab.c
index cb48fe6cf..cb48fe6cf 100644
--- a/clutter/tests/interactive/test-grab.c
+++ b/src/tests/clutter/interactive/test-grab.c
diff --git a/clutter/tests/interactive/test-image.c b/src/tests/clutter/interactive/test-image.c
index a3dc28c26..a3dc28c26 100644
--- a/clutter/tests/interactive/test-image.c
+++ b/src/tests/clutter/interactive/test-image.c
diff --git a/clutter/tests/interactive/test-keyframe-transition.c b/src/tests/clutter/interactive/test-keyframe-transition.c
index ec5d0c5b5..ec5d0c5b5 100644
--- a/clutter/tests/interactive/test-keyframe-transition.c
+++ b/src/tests/clutter/interactive/test-keyframe-transition.c
diff --git a/clutter/tests/interactive/test-layout.c b/src/tests/clutter/interactive/test-layout.c
index 7a5b3cf2e..7a5b3cf2e 100644
--- a/clutter/tests/interactive/test-layout.c
+++ b/src/tests/clutter/interactive/test-layout.c
diff --git a/clutter/tests/interactive/test-main.c b/src/tests/clutter/interactive/test-main.c
index 586d6dc70..586d6dc70 100644
--- a/clutter/tests/interactive/test-main.c
+++ b/src/tests/clutter/interactive/test-main.c
diff --git a/clutter/tests/interactive/test-paint-wrapper.c b/src/tests/clutter/interactive/test-paint-wrapper.c
index 8f905cd8b..8f905cd8b 100644
--- a/clutter/tests/interactive/test-paint-wrapper.c
+++ b/src/tests/clutter/interactive/test-paint-wrapper.c
diff --git a/clutter/tests/interactive/test-path-constraint.c b/src/tests/clutter/interactive/test-path-constraint.c
index f802ed481..f802ed481 100644
--- a/clutter/tests/interactive/test-path-constraint.c
+++ b/src/tests/clutter/interactive/test-path-constraint.c
diff --git a/clutter/tests/interactive/test-rotate-zoom.c b/src/tests/clutter/interactive/test-rotate-zoom.c
index 071e454b3..071e454b3 100644
--- a/clutter/tests/interactive/test-rotate-zoom.c
+++ b/src/tests/clutter/interactive/test-rotate-zoom.c
diff --git a/clutter/tests/interactive/test-scale.c b/src/tests/clutter/interactive/test-scale.c
index f885e9ccd..f885e9ccd 100644
--- a/clutter/tests/interactive/test-scale.c
+++ b/src/tests/clutter/interactive/test-scale.c
diff --git a/clutter/tests/interactive/test-script-signals.json b/src/tests/clutter/interactive/test-script-signals.json
index 0d3f6bd25..0d3f6bd25 100644
--- a/clutter/tests/interactive/test-script-signals.json
+++ b/src/tests/clutter/interactive/test-script-signals.json
diff --git a/clutter/tests/interactive/test-script.c b/src/tests/clutter/interactive/test-script.c
index 66c716e43..66c716e43 100644
--- a/clutter/tests/interactive/test-script.c
+++ b/src/tests/clutter/interactive/test-script.c
diff --git a/clutter/tests/interactive/test-script.json b/src/tests/clutter/interactive/test-script.json
index 54d4fb457..54d4fb457 100644
--- a/clutter/tests/interactive/test-script.json
+++ b/src/tests/clutter/interactive/test-script.json
diff --git a/clutter/tests/interactive/test-scrolling.c b/src/tests/clutter/interactive/test-scrolling.c
index d4137bf14..d4137bf14 100644
--- a/clutter/tests/interactive/test-scrolling.c
+++ b/src/tests/clutter/interactive/test-scrolling.c
diff --git a/clutter/tests/interactive/test-shader-effects.c b/src/tests/clutter/interactive/test-shader-effects.c
index a64a0ba29..a64a0ba29 100644
--- a/clutter/tests/interactive/test-shader-effects.c
+++ b/src/tests/clutter/interactive/test-shader-effects.c
diff --git a/clutter/tests/interactive/test-stage-read-pixels.c b/src/tests/clutter/interactive/test-stage-read-pixels.c
index c1ace8498..c1ace8498 100644
--- a/clutter/tests/interactive/test-stage-read-pixels.c
+++ b/src/tests/clutter/interactive/test-stage-read-pixels.c
diff --git a/clutter/tests/interactive/test-stage-sizing.c b/src/tests/clutter/interactive/test-stage-sizing.c
index c4fedb956..c4fedb956 100644
--- a/clutter/tests/interactive/test-stage-sizing.c
+++ b/src/tests/clutter/interactive/test-stage-sizing.c
diff --git a/clutter/tests/interactive/test-state-script.c b/src/tests/clutter/interactive/test-state-script.c
index 66b54b092..66b54b092 100644
--- a/clutter/tests/interactive/test-state-script.c
+++ b/src/tests/clutter/interactive/test-state-script.c
diff --git a/clutter/tests/interactive/test-state.c b/src/tests/clutter/interactive/test-state.c
index b6894eac5..b6894eac5 100644
--- a/clutter/tests/interactive/test-state.c
+++ b/src/tests/clutter/interactive/test-state.c
diff --git a/clutter/tests/interactive/test-swipe-action.c b/src/tests/clutter/interactive/test-swipe-action.c
index 3d0877401..3d0877401 100644
--- a/clutter/tests/interactive/test-swipe-action.c
+++ b/src/tests/clutter/interactive/test-swipe-action.c
diff --git a/clutter/tests/interactive/test-table-layout.c b/src/tests/clutter/interactive/test-table-layout.c
index 355944b06..355944b06 100644
--- a/clutter/tests/interactive/test-table-layout.c
+++ b/src/tests/clutter/interactive/test-table-layout.c
diff --git a/clutter/tests/interactive/test-text-field.c b/src/tests/clutter/interactive/test-text-field.c
index 8d203a22a..8d203a22a 100644
--- a/clutter/tests/interactive/test-text-field.c
+++ b/src/tests/clutter/interactive/test-text-field.c
diff --git a/clutter/tests/interactive/test-text.c b/src/tests/clutter/interactive/test-text.c
index bbe2a1b4e..bbe2a1b4e 100644
--- a/clutter/tests/interactive/test-text.c
+++ b/src/tests/clutter/interactive/test-text.c
diff --git a/clutter/tests/interactive/test-texture-async.c b/src/tests/clutter/interactive/test-texture-async.c
index 9a5574fac..9a5574fac 100644
--- a/clutter/tests/interactive/test-texture-async.c
+++ b/src/tests/clutter/interactive/test-texture-async.c
diff --git a/clutter/tests/interactive/test-texture-material.c b/src/tests/clutter/interactive/test-texture-material.c
index 90fbcf714..90fbcf714 100644
--- a/clutter/tests/interactive/test-texture-material.c
+++ b/src/tests/clutter/interactive/test-texture-material.c
diff --git a/clutter/tests/interactive/test-texture-quality.c b/src/tests/clutter/interactive/test-texture-quality.c
index 91c0f0dc6..91c0f0dc6 100644
--- a/clutter/tests/interactive/test-texture-quality.c
+++ b/src/tests/clutter/interactive/test-texture-quality.c
diff --git a/clutter/tests/interactive/test-texture-slicing.c b/src/tests/clutter/interactive/test-texture-slicing.c
index 652fc3239..652fc3239 100644
--- a/clutter/tests/interactive/test-texture-slicing.c
+++ b/src/tests/clutter/interactive/test-texture-slicing.c
diff --git a/clutter/tests/interactive/test-touch-events.c b/src/tests/clutter/interactive/test-touch-events.c
index fd23838ca..fd23838ca 100644
--- a/clutter/tests/interactive/test-touch-events.c
+++ b/src/tests/clutter/interactive/test-touch-events.c
diff --git a/clutter/tests/interactive/wrapper.sh.in b/src/tests/clutter/interactive/wrapper.sh.in
index 90aa4e1b6..90aa4e1b6 100755
--- a/clutter/tests/interactive/wrapper.sh.in
+++ b/src/tests/clutter/interactive/wrapper.sh.in
diff --git a/clutter/tests/meson.build b/src/tests/clutter/meson.build
index 125d81e97..125d81e97 100644
--- a/clutter/tests/meson.build
+++ b/src/tests/clutter/meson.build
diff --git a/clutter/tests/micro-bench/.gitignore b/src/tests/clutter/micro-bench/.gitignore
index 13744d47e..13744d47e 100644
--- a/clutter/tests/micro-bench/.gitignore
+++ b/src/tests/clutter/micro-bench/.gitignore
diff --git a/clutter/tests/micro-bench/meson.build b/src/tests/clutter/micro-bench/meson.build
index b8fe1e794..b8fe1e794 100644
--- a/clutter/tests/micro-bench/meson.build
+++ b/src/tests/clutter/micro-bench/meson.build
diff --git a/clutter/tests/micro-bench/test-cogl-perf.c b/src/tests/clutter/micro-bench/test-cogl-perf.c
index 0b92219c5..0b92219c5 100644
--- a/clutter/tests/micro-bench/test-cogl-perf.c
+++ b/src/tests/clutter/micro-bench/test-cogl-perf.c
diff --git a/clutter/tests/micro-bench/test-picking.c b/src/tests/clutter/micro-bench/test-picking.c
index 845e600d9..845e600d9 100644
--- a/clutter/tests/micro-bench/test-picking.c
+++ b/src/tests/clutter/micro-bench/test-picking.c
diff --git a/clutter/tests/micro-bench/test-random-text.c b/src/tests/clutter/micro-bench/test-random-text.c
index 69eb6d018..69eb6d018 100644
--- a/clutter/tests/micro-bench/test-random-text.c
+++ b/src/tests/clutter/micro-bench/test-random-text.c
diff --git a/clutter/tests/micro-bench/test-text-perf.c b/src/tests/clutter/micro-bench/test-text-perf.c
index 710c83e27..710c83e27 100644
--- a/clutter/tests/micro-bench/test-text-perf.c
+++ b/src/tests/clutter/micro-bench/test-text-perf.c
diff --git a/clutter/tests/micro-bench/test-text.c b/src/tests/clutter/micro-bench/test-text.c
index d79bfd65a..d79bfd65a 100644
--- a/clutter/tests/micro-bench/test-text.c
+++ b/src/tests/clutter/micro-bench/test-text.c
diff --git a/clutter/tests/performance/.gitignore b/src/tests/clutter/performance/.gitignore
index 0d50b8430..0d50b8430 100644
--- a/clutter/tests/performance/.gitignore
+++ b/src/tests/clutter/performance/.gitignore
diff --git a/clutter/tests/performance/create-report.rb b/src/tests/clutter/performance/create-report.rb
index 43defc4af..43defc4af 100755
--- a/clutter/tests/performance/create-report.rb
+++ b/src/tests/clutter/performance/create-report.rb
diff --git a/clutter/tests/performance/joblist b/src/tests/clutter/performance/joblist
index ce046cc71..ce046cc71 100644
--- a/clutter/tests/performance/joblist
+++ b/src/tests/clutter/performance/joblist
diff --git a/clutter/tests/performance/makejobs.rb b/src/tests/clutter/performance/makejobs.rb
index 79499df9b..79499df9b 100755
--- a/clutter/tests/performance/makejobs.rb
+++ b/src/tests/clutter/performance/makejobs.rb
diff --git a/clutter/tests/performance/meson.build b/src/tests/clutter/performance/meson.build
index 1a6009bd4..1a6009bd4 100644
--- a/clutter/tests/performance/meson.build
+++ b/src/tests/clutter/performance/meson.build
diff --git a/clutter/tests/performance/test-common.h b/src/tests/clutter/performance/test-common.h
index 8c07389aa..8c07389aa 100644
--- a/clutter/tests/performance/test-common.h
+++ b/src/tests/clutter/performance/test-common.h
diff --git a/clutter/tests/performance/test-picking.c b/src/tests/clutter/performance/test-picking.c
index af5960026..af5960026 100644
--- a/clutter/tests/performance/test-picking.c
+++ b/src/tests/clutter/performance/test-picking.c
diff --git a/clutter/tests/performance/test-state-hidden.c b/src/tests/clutter/performance/test-state-hidden.c
index 64911b4eb..64911b4eb 100644
--- a/clutter/tests/performance/test-state-hidden.c
+++ b/src/tests/clutter/performance/test-state-hidden.c
diff --git a/clutter/tests/performance/test-state-interactive.c b/src/tests/clutter/performance/test-state-interactive.c
index 375783541..375783541 100644
--- a/clutter/tests/performance/test-state-interactive.c
+++ b/src/tests/clutter/performance/test-state-interactive.c
diff --git a/clutter/tests/performance/test-state-mini.c b/src/tests/clutter/performance/test-state-mini.c
index 773b9d061..773b9d061 100644
--- a/clutter/tests/performance/test-state-mini.c
+++ b/src/tests/clutter/performance/test-state-mini.c
diff --git a/clutter/tests/performance/test-state-pick.c b/src/tests/clutter/performance/test-state-pick.c
index 0dc450a64..0dc450a64 100644
--- a/clutter/tests/performance/test-state-pick.c
+++ b/src/tests/clutter/performance/test-state-pick.c
diff --git a/clutter/tests/performance/test-state.c b/src/tests/clutter/performance/test-state.c
index 7b0778cb4..7b0778cb4 100644
--- a/clutter/tests/performance/test-state.c
+++ b/src/tests/clutter/performance/test-state.c
diff --git a/clutter/tests/performance/test-text-perf.c b/src/tests/clutter/performance/test-text-perf.c
index bf08a4810..bf08a4810 100644
--- a/clutter/tests/performance/test-text-perf.c
+++ b/src/tests/clutter/performance/test-text-perf.c
diff --git a/src/tests/meson.build b/src/tests/meson.build
index eadef4173..51039d04f 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,3 +1,7 @@
+#if have_clutter_tests
+#  subdir('clutter')
+#endif
+
 tests_includepath = mutter_includes
 tests_c_args = mutter_c_args