[gdk-pixbuf/wip/otte/tga: 24/24] tests: Move test images

[Benjamin Otte <otte src gnome org>]

commit 4073222ff4fbd9fdd956e76b0ab0c356e4e3edfb
Author: Benjamin Otte <otte redhat com>
Date:   Thu Sep 24 13:18:01 2015 +0200

    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.

 tests/Makefile.am                                  |    5 +++--
 tests/pixbuf-randomly-modified.c                   |    2 +-
 tests/pixbuf-scale.c                               |   16 ++++++++--------
 tests/pixbuf-threads.c                             |    2 +-
 .../{ => randomly-modified}/invalid_bmp_1          |  Bin 6966 -> 6966 bytes
 .../{ => randomly-modified}/invalid_gif_test_1     |    0
 .../{ => randomly-modified}/invalid_gif_test_2     |  Bin 562 -> 562 bytes
 .../{ => randomly-modified}/invalid_gif_test_3     |  Bin 318 -> 318 bytes
 .../{ => randomly-modified}/invalid_gif_test_4     |  Bin 310 -> 310 bytes
 .../{ => randomly-modified}/invalid_ico_test_1     |  Bin 318 -> 318 bytes
 .../{ => randomly-modified}/invalid_ico_test_2     |  Bin 318 -> 318 bytes
 .../{ => randomly-modified}/invalid_ico_test_3     |    0
 .../{ => randomly-modified}/invalid_png_test_1     |    0
 .../{ => randomly-modified}/invalid_png_test_2     |  Bin 2755 -> 2755 bytes
 .../{ => randomly-modified}/invalid_png_test_3     |  Bin 64 -> 64 bytes
 .../{ => randomly-modified}/invalid_png_test_4     |    0
 .../{ => randomly-modified}/invalid_ppm_1          |    0
 .../{ => randomly-modified}/invalid_ppm_2          |    0
 .../{ => randomly-modified}/invalid_ppm_3          |    0
 .../{ => randomly-modified}/invalid_ppm_4          |    0
 .../{ => randomly-modified}/invalid_ppm_5          |    0
 .../{ => randomly-modified}/invalid_ppm_6          |    0
 .../{ => randomly-modified}/invalid_ppm_7          |    0
 .../{ => randomly-modified}/invalid_ppm_8          |    0
 .../{ => randomly-modified}/invalid_tga_test_1     |  Bin 23679 -> 23679 bytes
 .../{ => randomly-modified}/invalid_wbmp_test_1    |  Bin 318 -> 318 bytes
 .../{ => randomly-modified}/invalid_wbmp_test_2    |  Bin 318 -> 318 bytes
 .../{ => randomly-modified}/invalid_xpm_test_1     |    0
 .../test-images/{ => randomly-modified}/valid.xbm  |    0
 .../{ => randomly-modified}/valid_bmp_test         |  Bin 6966 -> 6966 bytes
 .../{ => randomly-modified}/valid_gif_test         |  Bin 310 -> 310 bytes
 .../valid_jpeg_progressive_test                    |  Bin 25206 -> 25206 bytes
 .../{ => randomly-modified}/valid_jpeg_test        |  Bin 22219 -> 22219 bytes
 .../{ => randomly-modified}/valid_png_test         |  Bin 2755 -> 2755 bytes
 .../{ => randomly-modified}/valid_ppm_1            |    0
 .../{ => randomly-modified}/valid_ppm_2            |    0
 .../{ => randomly-modified}/valid_ppm_3            |    0
 .../{ => randomly-modified}/valid_ppm_4            |    0
 .../{ => randomly-modified}/valid_ras_test         |  Bin 6944 -> 6944 bytes
 .../{ => randomly-modified}/valid_tga_test         |  Bin 23679 -> 23679 bytes
 .../{ => randomly-modified}/valid_tiff1_test       |  Bin 1954 -> 1954 bytes
 .../{ => randomly-modified}/valid_xpm_test         |    0
 42 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9e91277..49bfa55 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 69c90c4..60f8428 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 60d0a20..4bc6c7e 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 0afb646..7a56222 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_gif_test_1 b/tests/test-images/randomly-modified/invalid_gif_test_1
similarity index 100%
rename from tests/test-images/invalid_gif_test_1
rename to tests/test-images/randomly-modified/invalid_gif_test_1
diff --git a/tests/test-images/invalid_ico_test_3 b/tests/test-images/randomly-modified/invalid_ico_test_3
similarity index 100%
rename from tests/test-images/invalid_ico_test_3
rename to 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
similarity index 100%
rename from tests/test-images/invalid_png_test_1
rename to tests/test-images/randomly-modified/invalid_png_test_1
diff --git a/tests/test-images/invalid_png_test_4 b/tests/test-images/randomly-modified/invalid_png_test_4
similarity index 100%
rename from tests/test-images/invalid_png_test_4
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_1
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_2
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_3
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_4
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_5
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_6
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_7
rename to 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
similarity index 100%
rename from tests/test-images/invalid_ppm_8
rename to tests/test-images/randomly-modified/invalid_ppm_8
diff --git a/tests/test-images/invalid_xpm_test_1 b/tests/test-images/randomly-modified/invalid_xpm_test_1
similarity index 100%
rename from tests/test-images/invalid_xpm_test_1
rename to 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
similarity index 100%
rename from tests/test-images/valid.xbm
rename to tests/test-images/randomly-modified/valid.xbm
diff --git a/tests/test-images/valid_ppm_1 b/tests/test-images/randomly-modified/valid_ppm_1
similarity index 100%
rename from tests/test-images/valid_ppm_1
rename to 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
similarity index 100%
rename from tests/test-images/valid_ppm_2
rename to 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
similarity index 100%
rename from tests/test-images/valid_ppm_3
rename to 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
similarity index 100%
rename from tests/test-images/valid_ppm_4
rename to tests/test-images/randomly-modified/valid_ppm_4
diff --git a/tests/test-images/valid_xpm_test b/tests/test-images/randomly-modified/valid_xpm_test
similarity index 100%
rename from tests/test-images/valid_xpm_test
rename to tests/test-images/randomly-modified/valid_xpm_test