diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gd_color_map_test.c | 27 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/gdcolormaplookup/.gitignore | 1 | ||||
| -rw-r--r-- | tests/gdcolormaplookup/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/gdcolormaplookup/Makemodule.am | 5 | ||||
| -rw-r--r-- | tests/gdcolormaplookup/gdcolormaplookup.c | 24 |
8 files changed, 38 insertions, 28 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 076aabd..dbe9243 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- bin_PROGRAMS = gdcmpgif -check_PROGRAMS = gifanimtest gd_color_map_test +check_PROGRAMS = gifanimtest if HAVE_LIBPNG bin_PROGRAMS += gdtopng pngtogd webpng diff --git a/src/gd_color_map_test.c b/src/gd_color_map_test.c deleted file mode 100644 index 26e08bd..0000000 --- a/src/gd_color_map_test.c +++ /dev/null @@ -1,27 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <stdio.h> -#include "gd.h" -#include "gd_color_map.h" - -int -main(void) -{ - int r, g, b; - int i; - for (i=0; i<GD_COLOR_MAP_X11.num_entries; i++) { - char *color_name = GD_COLOR_MAP_X11.entries[i].color_name; - if (gdColorMapLookup(GD_COLOR_MAP_X11, color_name, &r, &g, &b)) { - printf("%s found: #%02x%02x%02x\n", color_name, r, g, b); - } else { - fprintf(stderr, "%s not found\n", color_name); - return 1; - } - } - if (gdColorMapLookup(GD_COLOR_MAP_X11, "no such name", &r, &g, &b)) { - return 2; - } - return 0; -} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d239f49..51f09c4 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -23,6 +23,7 @@ if (BUILD_TEST) freetype gd gd2 + gdcolormaplookup gdimagearc gdimagebrightness gdimageclone diff --git a/tests/Makefile.am b/tests/Makefile.am index 3630810..51177a6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,6 +19,7 @@ include fontconfig/Makemodule.am include freetype/Makemodule.am include gd/Makemodule.am include gd2/Makemodule.am +include gdcolormaplookup/Makemodule.am include gdimagearc/Makemodule.am include gdimagebrightness/Makemodule.am include gdimageclone/Makemodule.am diff --git a/tests/gdcolormaplookup/.gitignore b/tests/gdcolormaplookup/.gitignore new file mode 100644 index 0000000..ace9067 --- /dev/null +++ b/tests/gdcolormaplookup/.gitignore @@ -0,0 +1 @@ +/gdcolormaplookup diff --git a/tests/gdcolormaplookup/CMakeLists.txt b/tests/gdcolormaplookup/CMakeLists.txt new file mode 100644 index 0000000..e4792a5 --- /dev/null +++ b/tests/gdcolormaplookup/CMakeLists.txt @@ -0,0 +1,5 @@ +LIST(APPEND TESTS_FILES + gdcolormaplookup +) + +ADD_GD_TESTS() diff --git a/tests/gdcolormaplookup/Makemodule.am b/tests/gdcolormaplookup/Makemodule.am new file mode 100644 index 0000000..d31d64b --- /dev/null +++ b/tests/gdcolormaplookup/Makemodule.am @@ -0,0 +1,5 @@ +libgd_test_programs += \ + gdcolormaplookup/gdcolormaplookup + +EXTRA_DIST += \ + gdcolormaplookup/CMakeLists.txt diff --git a/tests/gdcolormaplookup/gdcolormaplookup.c b/tests/gdcolormaplookup/gdcolormaplookup.c new file mode 100644 index 0000000..76cf36b --- /dev/null +++ b/tests/gdcolormaplookup/gdcolormaplookup.c @@ -0,0 +1,24 @@ +/** + * Test API gdColorMapLookup defined in gd_color_map.h + * Move from src/gd_color_map_test.c + */ + +#include "gd_color_map.h" +#include "gdtest.h" + +int +main(void) +{ + int r, g, b; + int i; + int ret; + for (i=0; i<GD_COLOR_MAP_X11.num_entries; i++) { + char *color_name = GD_COLOR_MAP_X11.entries[i].color_name; + ret = gdColorMapLookup(GD_COLOR_MAP_X11, color_name, &r, &g, &b); + gdTestAssert(ret == 1); + } + ret = gdColorMapLookup(GD_COLOR_MAP_X11, "no such name", &r, &g, &b); + gdTestAssert(ret == 0); + + return gdNumFailures(); +} |