Merge pull request #636 from willson-chen/mv_gd_color_map_test_to_tests

Move src/gd_color_map_test.c to tests

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

src/gd_color_map_test.c

@@ -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;
-}

tests/CMakeLists.txt

@@ -23,6 +23,7 @@ if (BUILD_TEST)
 		freetype
 		gd
 		gd2
+		gdcolormaplookup
 		gdimagearc
 		gdimagebrightness
 		gdimageclone

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

tests/gdcolormaplookup/.gitignore

@@ -0,0 +1 @@
+/gdcolormaplookup

tests/gdcolormaplookup/CMakeLists.txt

@@ -0,0 +1,5 @@
+LIST(APPEND TESTS_FILES
+	gdcolormaplookup
+)
+
+ADD_GD_TESTS()

tests/gdcolormaplookup/Makemodule.am

@@ -0,0 +1,5 @@
+libgd_test_programs += \
+	gdcolormaplookup/gdcolormaplookup
+
+EXTRA_DIST += \
+	gdcolormaplookup/CMakeLists.txt

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();
+}