summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2015-10-06 01:13:04 +0200
committerBenjamin Otte <otte@redhat.com>2015-10-06 04:28:03 +0200
commitab39a47af44de683b8460ddd00f73fd9d1f55074 (patch)
tree142634eb618436bbc64c246cd50437d792691b1c
parent3ba363287141bbc487a1145e027396418f0da6c9 (diff)
downloadgdk-pixbuf-ab39a47af44de683b8460ddd00f73fd9d1f55074.tar.gz
tests: Name test images properly
Make sure they have a sane file extension so it's easy for tools to identify them from their filename.
-rw-r--r--tests/pixbuf-scale.c14
-rw-r--r--tests/pixbuf-threads.c16
-rw-r--r--tests/test-images/randomly-modified/invalid.1.bmp (renamed from tests/test-images/randomly-modified/invalid_bmp_1)bin6966 -> 6966 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.1.gif (renamed from tests/test-images/randomly-modified/invalid_gif_test_1)0
-rw-r--r--tests/test-images/randomly-modified/invalid.1.ico (renamed from tests/test-images/randomly-modified/invalid_ico_test_1)bin318 -> 318 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.1.png (renamed from tests/test-images/randomly-modified/invalid_png_test_1)0
-rw-r--r--tests/test-images/randomly-modified/invalid.1.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_1)0
-rw-r--r--tests/test-images/randomly-modified/invalid.1.tga (renamed from tests/test-images/randomly-modified/invalid_tga_test_1)bin23679 -> 23679 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.1.xpm (renamed from tests/test-images/randomly-modified/invalid_xpm_test_1)0
-rw-r--r--tests/test-images/randomly-modified/invalid.2.gif (renamed from tests/test-images/randomly-modified/invalid_gif_test_2)bin562 -> 562 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.2.ico (renamed from tests/test-images/randomly-modified/invalid_ico_test_2)bin318 -> 318 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.2.png (renamed from tests/test-images/randomly-modified/invalid_png_test_2)bin2755 -> 2755 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.2.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_2)0
-rw-r--r--tests/test-images/randomly-modified/invalid.3.gif (renamed from tests/test-images/randomly-modified/invalid_gif_test_3)bin318 -> 318 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.3.ico (renamed from tests/test-images/randomly-modified/invalid_ico_test_3)0
-rw-r--r--tests/test-images/randomly-modified/invalid.3.png (renamed from tests/test-images/randomly-modified/invalid_png_test_3)bin64 -> 64 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.3.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_3)0
-rw-r--r--tests/test-images/randomly-modified/invalid.4.gif (renamed from tests/test-images/randomly-modified/invalid_gif_test_4)bin310 -> 310 bytes
-rw-r--r--tests/test-images/randomly-modified/invalid.4.png (renamed from tests/test-images/randomly-modified/invalid_png_test_4)0
-rw-r--r--tests/test-images/randomly-modified/invalid.4.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_4)0
-rw-r--r--tests/test-images/randomly-modified/invalid.5.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_5)0
-rw-r--r--tests/test-images/randomly-modified/invalid.6.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_6)0
-rw-r--r--tests/test-images/randomly-modified/invalid.7.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_7)0
-rw-r--r--tests/test-images/randomly-modified/invalid.8.ppm (renamed from tests/test-images/randomly-modified/invalid_ppm_8)0
-rw-r--r--tests/test-images/randomly-modified/valid.1.bmp (renamed from tests/test-images/randomly-modified/valid_bmp_test)bin6966 -> 6966 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.gif (renamed from tests/test-images/randomly-modified/valid_gif_test)bin310 -> 310 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.jpeg (renamed from tests/test-images/randomly-modified/valid_jpeg_test)bin22219 -> 22219 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.png (renamed from tests/test-images/randomly-modified/valid_png_test)bin2755 -> 2755 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.ppm (renamed from tests/test-images/randomly-modified/valid_ppm_1)0
-rw-r--r--tests/test-images/randomly-modified/valid.1.tga (renamed from tests/test-images/randomly-modified/valid_tga_test)bin23679 -> 23679 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.tiff (renamed from tests/test-images/randomly-modified/valid_tiff1_test)bin1954 -> 1954 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.1.xbm (renamed from tests/test-images/randomly-modified/valid.xbm)0
-rw-r--r--tests/test-images/randomly-modified/valid.1.xpm (renamed from tests/test-images/randomly-modified/valid_xpm_test)0
-rw-r--r--tests/test-images/randomly-modified/valid.2.jpeg (renamed from tests/test-images/randomly-modified/valid_jpeg_progressive_test)bin25206 -> 25206 bytes
-rw-r--r--tests/test-images/randomly-modified/valid.2.ppm (renamed from tests/test-images/randomly-modified/valid_ppm_2)0
-rw-r--r--tests/test-images/randomly-modified/valid.3.ppm (renamed from tests/test-images/randomly-modified/valid_ppm_3)0
-rw-r--r--tests/test-images/randomly-modified/valid.4.ppm (renamed from tests/test-images/randomly-modified/valid_ppm_4)0
37 files changed, 15 insertions, 15 deletions
diff --git a/tests/pixbuf-scale.c b/tests/pixbuf-scale.c
index d1a185069..aa2180c76 100644
--- a/tests/pixbuf-scale.c
+++ b/tests/pixbuf-scale.c
@@ -174,13 +174,13 @@ main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
- 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/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", "test-images/randomly-modified/valid.1.png", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/bmp", "test-images/randomly-modified/valid.1.bmp", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/gif", "test-images/randomly-modified/valid.1.gif", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/jpeg", "test-images/randomly-modified/valid.1.jpeg", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/tga", "test-images/randomly-modified/valid.1.tga", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/xpm", "test-images/randomly-modified/valid.1.xpm", test_scale);
+ g_test_add_data_func ("/pixbuf/scale/xbm", "test-images/randomly-modified/valid.1.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 1db139c99..8ea15a158 100644
--- a/tests/pixbuf-threads.c
+++ b/tests/pixbuf-threads.c
@@ -73,21 +73,21 @@ test_threads (void)
for (i = 0; i < iterations; i++)
{
if (format_supported ("jpeg"))
- g_thread_pool_push (pool, "valid_jpeg_test", NULL);
+ g_thread_pool_push (pool, "valid.1.jpeg", NULL);
if (format_supported ("png"))
- g_thread_pool_push (pool, "valid_png_test", NULL);
+ g_thread_pool_push (pool, "valid.1.png", NULL);
if (format_supported ("gif"))
- g_thread_pool_push (pool, "valid_gif_test", NULL);
+ g_thread_pool_push (pool, "valid.1.gif", NULL);
if (format_supported ("bmp"))
- g_thread_pool_push (pool, "valid_bmp_test", NULL);
+ g_thread_pool_push (pool, "valid.1.bmp", NULL);
if (format_supported ("jpeg"))
- g_thread_pool_push (pool, "valid_jpeg_progressive_test", NULL);
+ g_thread_pool_push (pool, "valid.2.jpeg", NULL);
if (format_supported ("xpm"))
- g_thread_pool_push (pool, "valid_xpm_test", NULL);
+ g_thread_pool_push (pool, "valid.1.xpm", NULL);
if (format_supported ("tga"))
- g_thread_pool_push (pool, "valid_tga_test", NULL);
+ g_thread_pool_push (pool, "valid.1.tga", NULL);
if (format_supported ("tiff"))
- g_thread_pool_push (pool, "valid_tiff1_test", NULL);
+ g_thread_pool_push (pool, "valid.1.tiff", NULL);
}
g_thread_pool_free (pool, FALSE, TRUE);
diff --git a/tests/test-images/randomly-modified/invalid_bmp_1 b/tests/test-images/randomly-modified/invalid.1.bmp
index 1496303ac..1496303ac 100644
--- a/tests/test-images/randomly-modified/invalid_bmp_1
+++ b/tests/test-images/randomly-modified/invalid.1.bmp
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_gif_test_1 b/tests/test-images/randomly-modified/invalid.1.gif
index ab36331f9..ab36331f9 100644
--- a/tests/test-images/randomly-modified/invalid_gif_test_1
+++ b/tests/test-images/randomly-modified/invalid.1.gif
diff --git a/tests/test-images/randomly-modified/invalid_ico_test_1 b/tests/test-images/randomly-modified/invalid.1.ico
index 2994b7d69..2994b7d69 100644
--- a/tests/test-images/randomly-modified/invalid_ico_test_1
+++ b/tests/test-images/randomly-modified/invalid.1.ico
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_png_test_1 b/tests/test-images/randomly-modified/invalid.1.png
index 6f2781a55..6f2781a55 100644
--- a/tests/test-images/randomly-modified/invalid_png_test_1
+++ b/tests/test-images/randomly-modified/invalid.1.png
diff --git a/tests/test-images/randomly-modified/invalid_ppm_1 b/tests/test-images/randomly-modified/invalid.1.ppm
index a1689c50c..a1689c50c 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_1
+++ b/tests/test-images/randomly-modified/invalid.1.ppm
diff --git a/tests/test-images/randomly-modified/invalid_tga_test_1 b/tests/test-images/randomly-modified/invalid.1.tga
index 28b911ed4..28b911ed4 100644
--- a/tests/test-images/randomly-modified/invalid_tga_test_1
+++ b/tests/test-images/randomly-modified/invalid.1.tga
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_xpm_test_1 b/tests/test-images/randomly-modified/invalid.1.xpm
index ae38b7481..ae38b7481 100644
--- a/tests/test-images/randomly-modified/invalid_xpm_test_1
+++ b/tests/test-images/randomly-modified/invalid.1.xpm
diff --git a/tests/test-images/randomly-modified/invalid_gif_test_2 b/tests/test-images/randomly-modified/invalid.2.gif
index 90ced1408..90ced1408 100644
--- a/tests/test-images/randomly-modified/invalid_gif_test_2
+++ b/tests/test-images/randomly-modified/invalid.2.gif
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_ico_test_2 b/tests/test-images/randomly-modified/invalid.2.ico
index 10c7542dc..10c7542dc 100644
--- a/tests/test-images/randomly-modified/invalid_ico_test_2
+++ b/tests/test-images/randomly-modified/invalid.2.ico
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_png_test_2 b/tests/test-images/randomly-modified/invalid.2.png
index 1b8b0978c..1b8b0978c 100644
--- a/tests/test-images/randomly-modified/invalid_png_test_2
+++ b/tests/test-images/randomly-modified/invalid.2.png
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_ppm_2 b/tests/test-images/randomly-modified/invalid.2.ppm
index c62bd18e4..c62bd18e4 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_2
+++ b/tests/test-images/randomly-modified/invalid.2.ppm
diff --git a/tests/test-images/randomly-modified/invalid_gif_test_3 b/tests/test-images/randomly-modified/invalid.3.gif
index d69c80361..d69c80361 100644
--- a/tests/test-images/randomly-modified/invalid_gif_test_3
+++ b/tests/test-images/randomly-modified/invalid.3.gif
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_ico_test_3 b/tests/test-images/randomly-modified/invalid.3.ico
index 631273df4..631273df4 100644
--- a/tests/test-images/randomly-modified/invalid_ico_test_3
+++ b/tests/test-images/randomly-modified/invalid.3.ico
diff --git a/tests/test-images/randomly-modified/invalid_png_test_3 b/tests/test-images/randomly-modified/invalid.3.png
index a335aa9c9..a335aa9c9 100644
--- a/tests/test-images/randomly-modified/invalid_png_test_3
+++ b/tests/test-images/randomly-modified/invalid.3.png
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_ppm_3 b/tests/test-images/randomly-modified/invalid.3.ppm
index 62395eb26..62395eb26 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_3
+++ b/tests/test-images/randomly-modified/invalid.3.ppm
diff --git a/tests/test-images/randomly-modified/invalid_gif_test_4 b/tests/test-images/randomly-modified/invalid.4.gif
index b2e4fbecc..b2e4fbecc 100644
--- a/tests/test-images/randomly-modified/invalid_gif_test_4
+++ b/tests/test-images/randomly-modified/invalid.4.gif
Binary files differ
diff --git a/tests/test-images/randomly-modified/invalid_png_test_4 b/tests/test-images/randomly-modified/invalid.4.png
index 7239470c8..7239470c8 100644
--- a/tests/test-images/randomly-modified/invalid_png_test_4
+++ b/tests/test-images/randomly-modified/invalid.4.png
diff --git a/tests/test-images/randomly-modified/invalid_ppm_4 b/tests/test-images/randomly-modified/invalid.4.ppm
index 0f6e6b5d3..0f6e6b5d3 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_4
+++ b/tests/test-images/randomly-modified/invalid.4.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_5 b/tests/test-images/randomly-modified/invalid.5.ppm
index 46b08743a..46b08743a 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_5
+++ b/tests/test-images/randomly-modified/invalid.5.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_6 b/tests/test-images/randomly-modified/invalid.6.ppm
index 673d59e9a..673d59e9a 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_6
+++ b/tests/test-images/randomly-modified/invalid.6.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_7 b/tests/test-images/randomly-modified/invalid.7.ppm
index 21005c974..21005c974 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_7
+++ b/tests/test-images/randomly-modified/invalid.7.ppm
diff --git a/tests/test-images/randomly-modified/invalid_ppm_8 b/tests/test-images/randomly-modified/invalid.8.ppm
index cb03363d8..cb03363d8 100644
--- a/tests/test-images/randomly-modified/invalid_ppm_8
+++ b/tests/test-images/randomly-modified/invalid.8.ppm
diff --git a/tests/test-images/randomly-modified/valid_bmp_test b/tests/test-images/randomly-modified/valid.1.bmp
index 25f788e96..25f788e96 100644
--- a/tests/test-images/randomly-modified/valid_bmp_test
+++ b/tests/test-images/randomly-modified/valid.1.bmp
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_gif_test b/tests/test-images/randomly-modified/valid.1.gif
index 2cadd0c3a..2cadd0c3a 100644
--- a/tests/test-images/randomly-modified/valid_gif_test
+++ b/tests/test-images/randomly-modified/valid.1.gif
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_jpeg_test b/tests/test-images/randomly-modified/valid.1.jpeg
index 86c006aa4..86c006aa4 100644
--- a/tests/test-images/randomly-modified/valid_jpeg_test
+++ b/tests/test-images/randomly-modified/valid.1.jpeg
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_png_test b/tests/test-images/randomly-modified/valid.1.png
index 889f329ae..889f329ae 100644
--- a/tests/test-images/randomly-modified/valid_png_test
+++ b/tests/test-images/randomly-modified/valid.1.png
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_ppm_1 b/tests/test-images/randomly-modified/valid.1.ppm
index f20295282..f20295282 100644
--- a/tests/test-images/randomly-modified/valid_ppm_1
+++ b/tests/test-images/randomly-modified/valid.1.ppm
diff --git a/tests/test-images/randomly-modified/valid_tga_test b/tests/test-images/randomly-modified/valid.1.tga
index 445b4a586..445b4a586 100644
--- a/tests/test-images/randomly-modified/valid_tga_test
+++ b/tests/test-images/randomly-modified/valid.1.tga
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_tiff1_test b/tests/test-images/randomly-modified/valid.1.tiff
index a4b57533c..a4b57533c 100644
--- a/tests/test-images/randomly-modified/valid_tiff1_test
+++ b/tests/test-images/randomly-modified/valid.1.tiff
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid.xbm b/tests/test-images/randomly-modified/valid.1.xbm
index c7df99300..c7df99300 100644
--- a/tests/test-images/randomly-modified/valid.xbm
+++ b/tests/test-images/randomly-modified/valid.1.xbm
diff --git a/tests/test-images/randomly-modified/valid_xpm_test b/tests/test-images/randomly-modified/valid.1.xpm
index 6cbf59607..6cbf59607 100644
--- a/tests/test-images/randomly-modified/valid_xpm_test
+++ b/tests/test-images/randomly-modified/valid.1.xpm
diff --git a/tests/test-images/randomly-modified/valid_jpeg_progressive_test b/tests/test-images/randomly-modified/valid.2.jpeg
index a8d5c4725..a8d5c4725 100644
--- a/tests/test-images/randomly-modified/valid_jpeg_progressive_test
+++ b/tests/test-images/randomly-modified/valid.2.jpeg
Binary files differ
diff --git a/tests/test-images/randomly-modified/valid_ppm_2 b/tests/test-images/randomly-modified/valid.2.ppm
index ceb4bd714..ceb4bd714 100644
--- a/tests/test-images/randomly-modified/valid_ppm_2
+++ b/tests/test-images/randomly-modified/valid.2.ppm
diff --git a/tests/test-images/randomly-modified/valid_ppm_3 b/tests/test-images/randomly-modified/valid.3.ppm
index e4add3ee1..e4add3ee1 100644
--- a/tests/test-images/randomly-modified/valid_ppm_3
+++ b/tests/test-images/randomly-modified/valid.3.ppm
diff --git a/tests/test-images/randomly-modified/valid_ppm_4 b/tests/test-images/randomly-modified/valid.4.ppm
index f1149873a..f1149873a 100644
--- a/tests/test-images/randomly-modified/valid_ppm_4
+++ b/tests/test-images/randomly-modified/valid.4.ppm