diff options
Diffstat (limited to 't/tap-more.sh')
| -rw-r--r-- | t/tap-more.sh | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/t/tap-more.sh b/t/tap-more.sh index 8be3ab903..0b9523bef 100644 --- a/t/tap-more.sh +++ b/t/tap-more.sh @@ -28,7 +28,8 @@ fetch_tap_driver -cat >> configure.ac <<END +cat >> configure.ac << 'END' +AC_SUBST([LOG_DRIVER], ["dummy but required"]) AC_SUBST([AM_TEST_LOG_DRIVER_FLAGS], ['--comments']) AC_OUTPUT END @@ -39,6 +40,13 @@ TESTS = 1.test 2.test 3.test EXTRA_DIST = $(TESTS) tap-driver END +cat > test-driver <<'END' +#!/bin/sh +echo "$0: required by Automake, but should never be actually used" >&2 +exit 1 +END +chmod a+x test-driver + cat > 1.test <<'END' #! /bin/sh echo 1..2 @@ -85,7 +93,6 @@ for try in 0 1; do mkdir build cd build srcdir=.. - am_make=$MAKE elif test $try -eq 1; then # In-tree parallel build. srcdir=. @@ -96,18 +103,7 @@ for try in 0 1; do : ;; *) - # Some make implementations (e.g., HP-UX) don't grok '-j', - # some require no space between '-j' and the number of jobs - # (e.g., older GNU make versions), and some *do* require a - # space between '-j' and the number of jobs (e.g., Solaris - # dmake). We need a runtime test to see what works. - echo 'all:' > Makefile - for am_make in "$MAKE -j3" "$MAKE -j 3" "$MAKE"; do - $am_make && break - done - rm -f Makefile - MAKE=$am_make - unset am_make + MAKE="$MAKE -j3" ;; esac else |