From bf0c63d0a0233f20aef5fff4bf1bb33302276eca Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 13 Apr 2012 22:59:31 +0200 Subject: [ng] tests: remove some workarounds for non-GNU make * t/makej2.sh: Adjust heading comments. Don't check whether $MAKE groks the '-j' option: GNU make is assured to do so. * t/check-concurrency-bug9245.sh: Likewise. Fix botched indentation since we are at it. * t/remake4.sh: Adjust heading comments. * t/parallel-tests6.sh: Likewise. * t/deleted-am.sh: Remove extra '$sleep' call required to work around a bug of FreeBSD make. * t/colon6.test: Remove a workaround needed by HP-UX make. * t/spy.test: Likewise. Uncomment the part of the checks that still wasn't portable to BSD make. Signed-off-by: Stefano Lattarini --- t/check-concurrency-bug9245.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 't/check-concurrency-bug9245.sh') diff --git a/t/check-concurrency-bug9245.sh b/t/check-concurrency-bug9245.sh index 8c9dc5395..c2d3d53a3 100755 --- a/t/check-concurrency-bug9245.sh +++ b/t/check-concurrency-bug9245.sh @@ -14,8 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Look for a bug where FreeBSD make in concurrent mode reported success -# even when the Automake-generated parallel testsuite harness failed. +# Look for a bug where make in concurrent mode reported success even +# when the Automake-generated parallel testsuite harness failed. +# This issue was originally present only with FreeBSD make, but we +# keep the test anyway, for extra safety. # See automake bug#9245. . ./defs || Exit 1 @@ -42,12 +44,9 @@ $AUTOMAKE -a ./configure -# Some make implementations don't grok the '-j' option. -$MAKE -j1 || Exit 77 - for j in '' -j1 -j2; do $MAKE $j check && Exit 1 - $MAKE $j TESTS=foo.test check && Exit 1 + $MAKE $j TESTS=foo.test check && Exit 1 if test x"$am_parallel_tests" = x"yes"; then $MAKE $j recheck && Exit 1 $MAKE $j TEST_LOGS=foo.log check && Exit 1 -- cgit v1.2.1