tests: sync feature enable lists in cmake files #382

2017-02-15 11:14:25 -05:00 · 2017-02-15 11:14:25 -05:00 · 12a0f039b3
parent 660abbeb96
commit 12a0f039b3
35 changed files with 120 additions and 22 deletions
--- a/tests/bmp/CMakeLists.txt
+++ b/tests/bmp/CMakeLists.txt
@ -1,8 +1,13 @@
 LIST(APPEND TESTS_FILES
-	bmp_im2im
 	bmp_null
 	bug00275
 	bug00276
 )

+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	bmp_im2im
+)
+ENDIF(PNG_FOUND)
+
 ADD_GD_TESTS()
--- a/tests/gd/CMakeLists.txt
+++ b/tests/gd/CMakeLists.txt
@ -1,8 +1,13 @@
 LIST(APPEND TESTS_FILES
-	gd_im2im
 	gd_null
 	gd_num_colors
 	gd_versiontest
 )

+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	gd_im2im
+)
+ENDIF(PNG_FOUND)
+
 ADD_GD_TESTS()
--- a/tests/gd2/CMakeLists.txt
+++ b/tests/gd2/CMakeLists.txt
@ -4,12 +4,22 @@ LIST(APPEND TESTS_FILES
 	bug00309
 	bug00354
 	gd2_empty_file
-	gd2_im2im
-	gd2_null
 	php_bug_72339
-	gd2_read
 	gd2_read_corrupt
 	too_few_image_data
 )

+IF(ZLIB_FOUND)
+LIST(APPEND TESTS_FILES
+	gd2_null
+)
+
+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	gd2_im2im
+	gd2_read
+)
+ENDIF(PNG_FOUND)
+ENDIF(ZLIB_FOUND)
+
 ADD_GD_TESTS()
--- a/tests/gdimagearc/CMakeLists.txt
+++ b/tests/gdimagearc/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00079
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagebrightness/CMakeLists.txt
+++ b/tests/gdimagebrightness/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecolor/CMakeLists.txt
+++ b/tests/gdimagecolor/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecolorclosest/CMakeLists.txt
+++ b/tests/gdimagecolorclosest/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagecolorclosest
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecolorexact/CMakeLists.txt
+++ b/tests/gdimagecolorexact/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagecolorexact
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecolorreplace/CMakeLists.txt
+++ b/tests/gdimagecolorreplace/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagecolorreplace
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecolorresolve/CMakeLists.txt
+++ b/tests/gdimagecolorresolve/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagecolorresolve
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecontrast/CMakeLists.txt
+++ b/tests/gdimagecontrast/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimageconvolution/CMakeLists.txt
+++ b/tests/gdimageconvolution/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecopy/CMakeLists.txt
+++ b/tests/gdimagecopy/CMakeLists.txt
@ -1,6 +1,11 @@
 LIST(APPEND TESTS_FILES
 	bug00007
-	bug00081
 )

+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	bug00081
+)
+ENDIF(PNG_FOUND)
+
 ADD_GD_TESTS()
--- a/tests/gdimagecopyresampled/CMakeLists.txt
+++ b/tests/gdimagecopyresampled/CMakeLists.txt
@ -1,8 +1,10 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 	basic_alpha
 	exact_alpha
 	bug00201
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagecopyrotated/CMakeLists.txt
+++ b/tests/gdimagecopyrotated/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00020
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagefill/CMakeLists.txt
+++ b/tests/gdimagefill/CMakeLists.txt
@ -1,3 +1,4 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00002_1
 	bug00002_2
@ -5,5 +6,6 @@ LIST(APPEND TESTS_FILES
 	bug00002_4
 	bug00104_1
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagefilledarc/CMakeLists.txt
+++ b/tests/gdimagefilledarc/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	php_bug43828
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagefilledellipse/CMakeLists.txt
+++ b/tests/gdimagefilledellipse/CMakeLists.txt
@ -1,7 +1,9 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00010
 	bug00191
 	github_bug_00238
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagefilledpolygon/CMakeLists.txt
+++ b/tests/gdimagefilledpolygon/CMakeLists.txt
@ -1,3 +1,4 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagefilledpolygon0
 	gdimagefilledpolygon1
@ -7,5 +8,6 @@ LIST(APPEND TESTS_FILES
 	php_bug_64641
 	self_intersecting
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagefilltoborder/CMakeLists.txt
+++ b/tests/gdimagefilltoborder/CMakeLists.txt
@ -1,6 +1,8 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00037
 	github_bug_215
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimageflip/CMakeLists.txt
+++ b/tests/gdimageflip/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimageflip
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagegrayscale/CMakeLists.txt
+++ b/tests/gdimagegrayscale/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimageline/CMakeLists.txt
+++ b/tests/gdimageline/CMakeLists.txt
@ -1,12 +1,18 @@
 LIST(APPEND TESTS_FILES
-	gdimageline_aa
 	gdimageline_aa_outofrange
-	gdImageAALine_thickness
-	github_bug_167
+)
+
+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
 	bug00077
 	bug00072
 	bug00111
 	bug00315
+	gdimageline_aa
+	gdimageline_bug5
+	gdImageAALine_thickness
+	github_bug_167
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS(m)
--- a/tests/gdimagenegate/CMakeLists.txt
+++ b/tests/gdimagenegate/CMakeLists.txt
@ -1,5 +1,7 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	basic
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimageopenpolygon/CMakeLists.txt
+++ b/tests/gdimageopenpolygon/CMakeLists.txt
@ -1,8 +1,10 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimageopenpolygon0
 	gdimageopenpolygon1
 	gdimageopenpolygon2
 	gdimageopenpolygon3
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagepolygon/CMakeLists.txt
+++ b/tests/gdimagepolygon/CMakeLists.txt
@ -1,8 +1,10 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	gdimagepolygon0
 	gdimagepolygon1
 	gdimagepolygon2
 	gdimagepolygon3
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagerotate/CMakeLists.txt
+++ b/tests/gdimagerotate/CMakeLists.txt
@ -1,7 +1,14 @@
+IF(JPEG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00067
+)
+ENDIF(JPEG_FOUND)
+
+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
 	php_bug_64898
 	php_bug_65070
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagescale/Makemodule.am
+++ b/tests/gdimagescale/Makemodule.am
@ -1,4 +1,3 @@
-
 libgd_test_programs += \
 	gdimagescale/bug00329 \
 	gdimagescale/bug00330 \
--- a/tests/gdimagescatterex/CMakeLists.txt
+++ b/tests/gdimagescatterex/CMakeLists.txt
@ -1,6 +1,8 @@
+IF(PNG_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00208_1
 	bug00208_2
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdimagetruecolortopalette/Makemodule.am
+++ b/tests/gdimagetruecolortopalette/Makemodule.am
@ -1,4 +1,3 @@
-
 libgd_test_programs += \
 	gdimagetruecolortopalette/bug00307 \
 	gdimagetruecolortopalette/php_bug_72512
--- a/tests/gdtiled/CMakeLists.txt
+++ b/tests/gdtiled/CMakeLists.txt
@ -1,5 +1,9 @@
+IF(PNG_FOUND)
+IF(ZLIB_FOUND)
 LIST(APPEND TESTS_FILES
 	bug00032
 )
+ENDIF(ZLIB_FOUND)
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/gdtransformaffineboundingbox/Makemodule.am
+++ b/tests/gdtransformaffineboundingbox/Makemodule.am
@ -1,4 +1,3 @@
-
 libgd_test_programs += \
 	gdtransformaffineboundingbox/github_bug_00221

--- a/tests/gif/CMakeLists.txt
+++ b/tests/gif/CMakeLists.txt
@ -1,13 +1,18 @@
 LIST(APPEND TESTS_FILES
-	gif_im2im
-	gif_null
-	bug00005
 	bug00005_2
+	bug00181
+	bug00227
+	gif_null
+)
+
+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	bug00005
 	bug00006
 	bug00060
 	bug00066
-	bug00181
-	bug00227
+	gif_im2im
 )
+ENDIF(PNG_FOUND)

 ADD_GD_TESTS()
--- a/tests/jpeg/CMakeLists.txt
+++ b/tests/jpeg/CMakeLists.txt
@ -1,12 +1,17 @@
 IF(JPEG_FOUND)
 LIST(APPEND TESTS_FILES
+	bug_github_18
+	jpeg_empty_file
 	jpeg_im2im
 	jpeg_null
-	jpeg_read
-	jpeg_empty_file
-	jpeg_resolution
-	bug_github_18
 )
+
+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	jpeg_read
+	jpeg_resolution
+)
+ENDIF(PNG_FOUND)
 ENDIF(JPEG_FOUND)

 ADD_GD_TESTS()
--- a/tests/wbmp/CMakeLists.txt
+++ b/tests/wbmp/CMakeLists.txt
@ -1,6 +1,11 @@
 LIST(APPEND TESTS_FILES
-	wbmp_im2im
 	wbmp_null
 )

+IF(PNG_FOUND)
+LIST(APPEND TESTS_FILES
+	wbmp_im2im
+)
+ENDIF(PNG_FOUND)
+
 ADD_GD_TESTS()