X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2FMakefile.am;h=24f94e06294516878ec9bb4db9e1722c1aca5cdd;hb=e3234d6c08a4231c57643423d42f64d0b980c8b3;hp=3ccce2447a739840662e9a9fbe5d84561e411ade;hpb=04ac66863a96d0c80bd00cc02bc3ab1e6aa8a620;p=coloredstderr%2Fcoloredstderr.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3ccce24..24f94e0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,34 +1,43 @@
-TESTS = test_example.sh \
+# 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
 check_PROGRAMS = example example_exec
-example_SOURCES = example.c
-example_exec_SOURCES = example_exec.c
 
+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 = $(TESTS) lib.sh
-dist_check_DATA = example.expected \
+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_vfork.expected
 
-# Used by lib.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)"