[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

fix to check.am for FreeBSD /usr/bin/make

From: Mark D. Baushke
Subject: fix to check.am for FreeBSD /usr/bin/make
Date: Mon, 03 May 2004 23:13:48 -0700


Without the attached fix, a 'make check' will terminate with an error
when there is either no $skippped or $report text to be printed while
compiling using FreeBSD 4.9-STABLE /usr/bin/make as the make. This is
because FreeBSD make uses 'sh -e' to cause a shell command that fails
in the middle to fail the entire action. 

        -- Mark

ChangeLog Entry:

2004-05-03  Mark D Baushke  <mdb@gnu.org>

        * lib/am/check.am (check-TESTS): Correct the template to
        deal with FreeBSD make or any other make that runs actions
        using 'sh -e' to terminate whenver a command (such as test -n "")

--- automake-1.7.9/lib/am/check.am~     Wed Jun  4 12:23:26 2003
+++ automake-1.7.9/lib/am/check.am      Mon May  3 22:59:57 2004
@@ -92,8 +92,8 @@ check-TESTS: $(TESTS)
          dashes=`echo "$$dashes" | sed s/./=/g`; \
          echo "$$dashes"; \
          echo "$$banner"; \
-         test -n "$$skipped" && echo "$$skipped"; \
-         test -n "$$report" && echo "$$report"; \
+         test -n "$$skipped" && echo "$$skipped" || :; \
+         test -n "$$report" && echo "$$report" || :; \
          echo "$$dashes"; \
          test "$$failed" -eq 0; \
        else :; fi

reply via email to

[Prev in Thread] Current Thread [Next in Thread]