add cli tests of IM

[imagemagick] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dfd7e91d55cb42b3542231729ec914e8707b9c8..b7acfd8e10e9b52c44820d48560078102cb0e47e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+# Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
 # dedicated to making software imaging solutions freely available.
 #
 # You may not use this file except in compliance with the License.
@@ -15,29 +15,48 @@
 #  Makefile for the ImageMagick validation suite.
 
 TESTS_CHECK_PGRMS = \
-       tests/validate
+       tests/validate \
+       tests/drawtest \
+       tests/wandtest
 
 tests_validate_SOURCES = tests/validate.c tests/validate.h
 tests_validate_CPPFLAGS = $(AM_CPPFLAGS)
-tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+tests_validate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(MATH_LIBS)
+
+tests_drawtest_SOURCES = tests/drawtest.c
+tests_drawtest_LDFLAGS = $(LDFLAGS)
+tests_drawtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+
+tests_wandtest_SOURCES = tests/wandtest.c
+tests_wandtest_LDFLAGS = $(LDFLAGS)
+tests_wandtest_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 
 TESTS_XFAIL_TESTS = 
 
 TESTS_TESTS = \
-       tests/validate-compare.sh \
-       tests/validate-composite.sh \
-       tests/validate-convert.sh \
-       tests/validate-identify.sh \
-       tests/validate-import.sh \
-       tests/validate-montage.sh \
-       tests/validate-pipe.sh \
-       tests/validate-colorspace.sh \
-       tests/validate-stream.sh \
-       tests/validate-formats-in-memory.sh \
-       tests/validate-formats-on-disk.sh
+       tests/validate-compare.tap \
+       tests/validate-composite.tap \
+       tests/validate-convert.tap \
+       tests/validate-identify.tap \
+       tests/validate-import.tap \
+       tests/validate-montage.tap \
+       tests/validate-stream.tap \
+       tests/validate-formats-in-memory.tap \
+       tests/validate-formats-on-disk.tap \
+       tests/cli-colorspace.tap \
+       tests/cli-pipe.tap \
+       tests/drawtest.tap \
+       tests/wandtest.tap
 
 TESTS_EXTRA_DIST = \
-       tests/common.sh \
+       tests/common.shi \
+  tests/rose.pnm \
+  tests/input_256c.miff \
+  tests/input_bilevel.miff \
+  tests/input_gray.miff \
+  tests/input_truecolor.miff \
+  tests/sequence.miff \
        $(TESTS_TESTS)
 
-TESTS_CLEANFILES = 
+TESTS_CLEANFILES = \
+       tests/*_out.*