From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 20 Feb 2013 12:25:39 +0000 (+0100)
Subject: coverage: expose automake bug#13760
X-Git-Tag: v1.13.1d~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8234bfb0c0fa62b2c43b9c8f0a5ab5fc5316ff4c;p=thirdparty%2Fautomake.git

coverage: expose automake bug#13760

* t/make-dryrun.tap: Here.
* THANKS: Update with the name of the bug reporter.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/THANKS b/THANKS
index 66498d45e..d591d143d 100644
--- a/THANKS
+++ b/THANKS
@@ -48,6 +48,7 @@ Bob Friesenhahn                 bfriesen@simple.dallas.tx.us
 Bob Proulx                      rwp@hprwp.fc.hp.com
 Bob Rossi                       bob@brasko.net
 Bobby Jack                      bobbykjack@yahoo.co.uk
+Boris Kolpackov                 boris@codesynthesis.com
 Braden N. McDaniel              braden@endoframe.com
 Brandon Black                   blblack@gmail.com
 Brendan O'Dea                   bod@debian.org
diff --git a/t/make-dryrun.tap b/t/make-dryrun.tap
index 4aa7146cc..1459a9f37 100755
--- a/t/make-dryrun.tap
+++ b/t/make-dryrun.tap
@@ -18,7 +18,7 @@
 
 . test-init.sh
 
-plan_ 14
+plan_ 18
 
 if echo "all: ; +@printf %sbb%s aa cc" | $MAKE -n -f - | grep aabbcc; then
   make_plus_silence () { return 0; }
@@ -26,6 +26,13 @@ else
   make_plus_silence () { return 1; }
 fi
 
+mkdir none
+if echo nil: | $MAKE -I none -f -; then
+  make_supports_option_I () { return 0; }
+else
+  make_supports_option_I () { return 1; }
+fi
+
 echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am <<'END'
@@ -100,6 +107,25 @@ check_make --dry -C using_gmake "\$MAKE is not GNU make" --dry-run -k
 
 # ----------------------------------------------------------------------
 
+# Automake bug#13760: the "n" in "none" used to confound am__make_dryrun
+# into thinking the '-n' option had been passed.
+
+pr='bug#13760'
+
+check_make --run -X -C make_supports_option_I "-I make option unsupported" \
+                 -M "$pr" -I none
+
+check_make --run -X -C using_gmake "\$MAKE is not GNU make" \
+                 -M "$pr" -I none --include dry-run 
+
+check_make --dry -C make_supports_option_I "-I make option unsupported" \
+                 -M "$pr" -I none -n
+
+check_make --dry -C using_gmake "\$MAKE is not GNU make" \
+                 -M "$pr" --dry-run -I none --include dry-run
+
+# ----------------------------------------------------------------------
+
 # Test for when shell metacharacters or backslashes are in $(MAKEFLAGS).
 
 check_metachars ()