tests: Move test images

Make test-images/ a directory only containing subdirectories for ease of
maintenance.
Move all images from that directory to test-images/randomly-modified.

42 files changed, 13 insertions, 12 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e9127754..49bfa558f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -62,8 +62,9 @@ dist_installed_test_data =		\
 	cve-2015-4491.bmp		\
 	large.png			\
 	large.jpg			\
-	$(filter-out tga,$(wildcard $(srcdir)/test-images/*)) \
-	$(wildcard $(srcdir)/test-images/tga/*)
+	$(wildcard $(srcdir)/test-images/randomly-modified/*) \
+	$(wildcard $(srcdir)/test-images/tga/*) \
+	$(NULL)
 
 pixbuf_randomly_modified_SOURCES =	\
 	pixbuf-randomly-modified.c	\
diff --git a/tests/pixbuf-randomly-modified.c b/tests/pixbuf-randomly-modified.c
index 69c90c4d3..60f8428de 100644
--- a/tests/pixbuf-randomly-modified.c
+++ b/tests/pixbuf-randomly-modified.c
@@ -103,7 +103,7 @@ main (int argc, char **argv)
 
   g_test_init (&argc, &argv, NULL);
 
-  test_images_dir = g_build_filename (g_test_get_dir (G_TEST_DIST), "test-images", NULL);
+  test_images_dir = g_build_filename (g_test_get_dir (G_TEST_DIST), "test-images/randomly-modified", NULL);
   add_test_for_all_images ("/pixbuf/randomly-modified", test_images_dir, test_randomly_modified);
   g_free (test_images_dir);
 
diff --git a/tests/pixbuf-scale.c b/tests/pixbuf-scale.c
index 60d0a2029..4bc6c7e00 100644
--- a/tests/pixbuf-scale.c
+++ b/tests/pixbuf-scale.c
@@ -174,14 +174,14 @@ main (int argc, char **argv)
 {
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_data_func ("/pixbuf/scale/png", "test-images/valid_png_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/bmp", "test-images/valid_bmp_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/gif", "test-images/valid_gif_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/jpeg", "test-images/valid_jpeg_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/ras", "test-images/valid_ras_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/tga", "test-images/valid_tga_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/xpm", "test-images/valid_xpm_test", test_scale);
-  g_test_add_data_func ("/pixbuf/scale/xbm", "test-images/valid.xbm", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/png", "test-images/randomly-modified/valid_png_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/bmp", "test-images/randomly-modified/valid_bmp_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/gif", "test-images/randomly-modified/valid_gif_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/jpeg", "test-images/randomly-modified/valid_jpeg_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/ras", "test-images/randomly-modified/valid_ras_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/tga", "test-images/randomly-modified/valid_tga_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/xpm", "test-images/randomly-modified/valid_xpm_test", test_scale);
+  g_test_add_data_func ("/pixbuf/scale/xbm", "test-images/randomly-modified/valid.xbm", test_scale);
   g_test_add_data_func ("/pixbuf/scale/png/large", "large.png", test_scale_down);
   g_test_add_data_func ("/pixbuf/scale/jpeg/large", "large.jpg", test_scale_down);
   g_test_add_data_func ("/pixbuf/add-alpha/large", "large.png", test_add_alpha);
diff --git a/tests/pixbuf-threads.c b/tests/pixbuf-threads.c
index 0afb64617..7a56222c9 100644
--- a/tests/pixbuf-threads.c
+++ b/tests/pixbuf-threads.c
@@ -34,7 +34,7 @@ load_image (gpointer data,
   GError *error = NULL;
 
   loader = gdk_pixbuf_loader_new ();
-  path = g_test_get_filename (G_TEST_DIST, "test-images", filename, NULL);
+  path = g_test_get_filename (G_TEST_DIST, "test-images/randomly-modified", filename, NULL);
 
   g_test_message ("reading %s", path); 
   file = fopen (path, "r");
diff --git a/tests/test-images/invalid_bmp_1 b/tests/test-images/randomly-modified/invalid_bmp_1
index 1496303ac..1496303ac 100644
--- a/tests/test-images/invalid_bmp_1
+++ b/tests/test-images/randomly-modified/invalid_bmp_1
diff --git a/tests/test-images/invalid_gif_test_1 b/tests/test-images/randomly-modified/invalid_gif_test_1
index ab36331f9..ab36331f9 100644
--- a/tests/test-images/invalid_gif_test_1
+++ b/tests/test-images/randomly-modified/invalid_gif_test_1
diff --git a/tests/test-images/invalid_gif_test_2 b/tests/test-images/randomly-modified/invalid_gif_test_2
index 90ced1408..90ced1408 100644
--- a/tests/test-images/invalid_gif_test_2
+++ b/tests/test-images/randomly-modified/invalid_gif_test_2
diff --git a/tests/test-images/invalid_gif_test_3 b/tests/test-images/randomly-modified/invalid_gif_test_3
index d69c80361..d69c80361 100644
--- a/tests/test-images/invalid_gif_test_3
+++ b/tests/test-images/randomly-modified/invalid_gif_test_3
diff --git a/tests/test-images/invalid_gif_test_4 b/tests/test-images/randomly-modified/invalid_gif_test_4
index b2e4fbecc..b2e4fbecc 100644
--- a/tests/test-images/invalid_gif_test_4
+++ b/tests/test-images/randomly-modified/invalid_gif_test_4
diff --git a/tests/test-images/invalid_ico_test_1 b/tests/test-images/randomly-modified/invalid_ico_test_1
index 2994b7d69..2994b7d69 100644
--- a/tests/test-images/invalid_ico_test_1
+++ b/tests/test-images/randomly-modified/invalid_ico_test_1
diff --git a/tests/test-images/invalid_ico_test_2 b/tests/test-images/randomly-modified/invalid_ico_test_2
index 10c7542dc..10c7542dc 100644
--- a/tests/test-images/invalid_ico_test_2
+++ b/tests/test-images/randomly-modified/invalid_ico_test_2
diff --git a/tests/test-images/invalid_ico_test_3 b/tests/test-images/randomly-modified/invalid_ico_test_3
index 631273df4..631273df4 100644
--- a/tests/test-images/invalid_ico_test_3
+++ b/tests/test-images/randomly-modified/invalid_ico_test_3
diff --git a/tests/test-images/invalid_png_test_1 b/tests/test-images/randomly-modified/invalid_png_test_1
index 6f2781a55..6f2781a55 100644
--- a/tests/test-images/invalid_png_test_1
+++ b/tests/test-images/randomly-modified/invalid_png_test_1
diff --git a/tests/test-images/invalid_png_test_2 b/tests/test-images/randomly-modified/invalid_png_test_2
index 1b8b0978c..1b8b0978c 100644
--- a/tests/test-images/invalid_png_test_2
+++ b/tests/test-images/randomly-modified/invalid_png_test_2
diff --git a/tests/test-images/invalid_png_test_3 b/tests/test-images/randomly-modified/invalid_png_test_3
index a335aa9c9..a335aa9c9 100644
--- a/tests/test-images/invalid_png_test_3
+++ b/tests/test-images/randomly-modified/invalid_png_test_3
diff --git a/tests/test-images/invalid_png_test_4 b/tests/test-images/randomly-modified/invalid_png_test_4
index 7239470c8..7239470c8 100644
--- a/tests/test-images/invalid_png_test_4
+++ b/tests/test-images/randomly-modified/invalid_png_test_4
diff --git a/tests/test-images/invalid_ppm_1 b/tests/test-images/randomly-modified/invalid_ppm_1
index a1689c50c..a1689c50c 100644
--- a/tests/test-images/invalid_ppm_1
+++ b/tests/test-images/randomly-modified/invalid_ppm_1
diff --git a/tests/test-images/invalid_ppm_2 b/tests/test-images/randomly-modified/invalid_ppm_2
index c62bd18e4..c62bd18e4 100644
--- a/tests/test-images/invalid_ppm_2
+++ b/tests/test-images/randomly-modified/invalid_ppm_2
diff --git a/tests/test-images/invalid_ppm_3 b/tests/test-images/randomly-modified/invalid_ppm_3
index 62395eb26..62395eb26 100644
--- a/tests/test-images/invalid_ppm_3
+++ b/tests/test-images/randomly-modified/invalid_ppm_3
diff --git a/tests/test-images/invalid_ppm_4 b/tests/test-images/randomly-modified/invalid_ppm_4
index 0f6e6b5d3..0f6e6b5d3 100644
--- a/tests/test-images/invalid_ppm_4
+++ b/tests/test-images/randomly-modified/invalid_ppm_4
diff --git a/tests/test-images/invalid_ppm_5 b/tests/test-images/randomly-modified/invalid_ppm_5
index 46b08743a..46b08743a 100644
--- a/tests/test-images/invalid_ppm_5
+++ b/tests/test-images/randomly-modified/invalid_ppm_5
diff --git a/tests/test-images/invalid_ppm_6 b/tests/test-images/randomly-modified/invalid_ppm_6
index 673d59e9a..673d59e9a 100644
--- a/tests/test-images/invalid_ppm_6
+++ b/tests/test-images/randomly-modified/invalid_ppm_6
diff --git a/tests/test-images/invalid_ppm_7 b/tests/test-images/randomly-modified/invalid_ppm_7
index 21005c974..21005c974 100644
--- a/tests/test-images/invalid_ppm_7
+++ b/tests/test-images/randomly-modified/invalid_ppm_7
diff --git a/tests/test-images/invalid_ppm_8 b/tests/test-images/randomly-modified/invalid_ppm_8
index cb03363d8..cb03363d8 100644
--- a/tests/test-images/invalid_ppm_8
+++ b/tests/test-images/randomly-modified/invalid_ppm_8
diff --git a/tests/test-images/invalid_tga_test_1 b/tests/test-images/randomly-modified/invalid_tga_test_1
index 28b911ed4..28b911ed4 100644
--- a/tests/test-images/invalid_tga_test_1
+++ b/tests/test-images/randomly-modified/invalid_tga_test_1
diff --git a/tests/test-images/invalid_wbmp_test_1 b/tests/test-images/randomly-modified/invalid_wbmp_test_1
index 70d222d68..70d222d68 100644
--- a/tests/test-images/invalid_wbmp_test_1
+++ b/tests/test-images/randomly-modified/invalid_wbmp_test_1
diff --git a/tests/test-images/invalid_wbmp_test_2 b/tests/test-images/randomly-modified/invalid_wbmp_test_2
index 050a187ec..050a187ec 100644
--- a/tests/test-images/invalid_wbmp_test_2
+++ b/tests/test-images/randomly-modified/invalid_wbmp_test_2
diff --git a/tests/test-images/invalid_xpm_test_1 b/tests/test-images/randomly-modified/invalid_xpm_test_1
index ae38b7481..ae38b7481 100644
--- a/tests/test-images/invalid_xpm_test_1
+++ b/tests/test-images/randomly-modified/invalid_xpm_test_1
diff --git a/tests/test-images/valid.xbm b/tests/test-images/randomly-modified/valid.xbm
index c7df99300..c7df99300 100644
--- a/tests/test-images/valid.xbm
+++ b/tests/test-images/randomly-modified/valid.xbm
diff --git a/tests/test-images/valid_bmp_test b/tests/test-images/randomly-modified/valid_bmp_test
index 25f788e96..25f788e96 100644
--- a/tests/test-images/valid_bmp_test
+++ b/tests/test-images/randomly-modified/valid_bmp_test
diff --git a/tests/test-images/valid_gif_test b/tests/test-images/randomly-modified/valid_gif_test
index 2cadd0c3a..2cadd0c3a 100644
--- a/tests/test-images/valid_gif_test
+++ b/tests/test-images/randomly-modified/valid_gif_test
diff --git a/tests/test-images/valid_jpeg_progressive_test b/tests/test-images/randomly-modified/valid_jpeg_progressive_test
index a8d5c4725..a8d5c4725 100644
--- a/tests/test-images/valid_jpeg_progressive_test
+++ b/tests/test-images/randomly-modified/valid_jpeg_progressive_test
diff --git a/tests/test-images/valid_jpeg_test b/tests/test-images/randomly-modified/valid_jpeg_test
index 86c006aa4..86c006aa4 100644
--- a/tests/test-images/valid_jpeg_test
+++ b/tests/test-images/randomly-modified/valid_jpeg_test
diff --git a/tests/test-images/valid_png_test b/tests/test-images/randomly-modified/valid_png_test
index 889f329ae..889f329ae 100644
--- a/tests/test-images/valid_png_test
+++ b/tests/test-images/randomly-modified/valid_png_test
diff --git a/tests/test-images/valid_ppm_1 b/tests/test-images/randomly-modified/valid_ppm_1
index f20295282..f20295282 100644
--- a/tests/test-images/valid_ppm_1
+++ b/tests/test-images/randomly-modified/valid_ppm_1
diff --git a/tests/test-images/valid_ppm_2 b/tests/test-images/randomly-modified/valid_ppm_2
index ceb4bd714..ceb4bd714 100644
--- a/tests/test-images/valid_ppm_2
+++ b/tests/test-images/randomly-modified/valid_ppm_2
diff --git a/tests/test-images/valid_ppm_3 b/tests/test-images/randomly-modified/valid_ppm_3
index e4add3ee1..e4add3ee1 100644
--- a/tests/test-images/valid_ppm_3
+++ b/tests/test-images/randomly-modified/valid_ppm_3
diff --git a/tests/test-images/valid_ppm_4 b/tests/test-images/randomly-modified/valid_ppm_4
index f1149873a..f1149873a 100644
--- a/tests/test-images/valid_ppm_4
+++ b/tests/test-images/randomly-modified/valid_ppm_4
diff --git a/tests/test-images/valid_ras_test b/tests/test-images/randomly-modified/valid_ras_test
index 4325de1b5..4325de1b5 100644
--- a/tests/test-images/valid_ras_test
+++ b/tests/test-images/randomly-modified/valid_ras_test
diff --git a/tests/test-images/valid_tga_test b/tests/test-images/randomly-modified/valid_tga_test
index 445b4a586..445b4a586 100644
--- a/tests/test-images/valid_tga_test
+++ b/tests/test-images/randomly-modified/valid_tga_test
diff --git a/tests/test-images/valid_tiff1_test b/tests/test-images/randomly-modified/valid_tiff1_test
index a4b57533c..a4b57533c 100644
--- a/tests/test-images/valid_tiff1_test
+++ b/tests/test-images/randomly-modified/valid_tiff1_test
diff --git a/tests/test-images/valid_xpm_test b/tests/test-images/randomly-modified/valid_xpm_test
index 6cbf59607..6cbf59607 100644
--- a/tests/test-images/valid_xpm_test
+++ b/tests/test-images/randomly-modified/valid_xpm_test