From: Simon Ruderich Date: Thu, 8 Aug 2013 20:38:39 +0000 (+0200) Subject: tests/Makefile.am: Enable parallel and colored test runs. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=2c9bfb8a78142ef895f9f30a1169690f89430f8e;p=tlsproxy%2Ftlsproxy.git tests/Makefile.am: Enable parallel and colored test runs. Necessary for automake < 1.13. We can't run the tests in parallel and disable that, but this way all automake versions behave in the same way. --- diff --git a/tests/Makefile.am b/tests/Makefile.am index e727055..b231ccc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,6 @@ +# Default since automake 1.13, necessary for older versions. +AUTOMAKE_OPTIONS = color-tests parallel-tests + TESTS = tests-normal.sh tests-passthrough.sh tests-authentication.sh dist_check_SCRIPTS = $(TESTS) common.sh check_PROGRAMS = client @@ -11,3 +14,6 @@ CLEANFILES = \ proxy-invalid.pem \ proxy-key.pem \ tmp + +# Tests can't be run in parallel. +.NOTPARALLEL: