X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2FMakefile.am;h=2863950306485812108060c9c9aaa65e1d3ca0ca;hb=HEAD;hp=32d9ca35431ac1bff830c4454de8e8addb1a73b2;hpb=05aefe25bacd1c22bf2d5cc935aa9d3d28f5d841;p=coloredstderr%2Fcoloredstderr.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32d9ca3..2863950 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,28 +1,45 @@
-TESTS = run.sh
-check_PROGRAMS = example example_exec
-example_SOURCES = example.c
-example_exec_SOURCES = example_exec.c
+# Default since automake 1.13, necessary for older versions.
+AUTOMAKE_OPTIONS = color-tests parallel-tests
 
+TESTS = test_environment.sh \
+        test_example.sh \
+        test_exec.sh \
+        test_noforce.sh \
+        test_redirects.sh \
+        test_simple.sh \
+        test_stdio.sh
+check_PROGRAMS = example example_exec example_stdio
+
+if HAVE_ERR_H
+    TESTS += test_err.sh
+    check_PROGRAMS += example_err
+endif
 if HAVE_ERROR_H
+    TESTS += test_error.sh
     check_PROGRAMS += example_error
-    example_error_SOURCES = example_error.c
 endif
 if HAVE_VFORK
+    TESTS += test_vfork.sh
     check_PROGRAMS += example_vfork
-    example_vfork_SOURCES = example_vfork.c
 endif
 
-dist_check_SCRIPTS = run.sh lib.sh
-dist_check_DATA = example.expected \
+dist_check_SCRIPTS = $(TESTS) lib.sh
+dist_check_DATA = example.h \
+                  example.expected \
+                  example_environment.expected \
+                  example_environment_empty.expected \
+                  example_err.expected \
                   example_error.expected \
                   example_exec.expected \
-                  example_vfork.expected \
                   example_noforce.sh \
                   example_noforce.sh.expected \
                   example_redirects.sh \
                   example_redirects.sh.expected \
                   example_simple.sh \
-                  example_simple.sh.expected
+                  example_simple.sh.expected \
+                  example_stdio.expected \
+                  example_vfork.expected
 
-# Used by run.sh.
-export EGREP
+# Used by lib.sh. Can't use "export EGREP" because it doesn't work with BSD's
+# make.
+AM_MAKEFLAGS = "EGREP=$(EGREP)"