From: Tom Tromey <tromey@redhat.com>
Date: Thu, 25 Apr 1996 23:15:13 +0000 (+0000)
Subject: Added test
X-Git-Tag: Release-0-32~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e87494fd2d8fe16ba5c0040f2ab5844af612e124;p=thirdparty%2Fautomake.git

Added test
---

diff --git a/ChangeLog b/ChangeLog
index 0ba1a151c..c91e02d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Apr 23 17:57:13 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* doc/mdate-sh: Extract the last field from the date output, not
+ 	the sixth, which will fail when the timezone name has more than
+ 	one word or is missing.
+
 Wed Apr 24 20:29:26 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* automake.in (am_install_var): Use delete, not undef, to remove
diff --git a/THANKS b/THANKS
index 952b5cd89..a59ebb58c 100644
--- a/THANKS
+++ b/THANKS
@@ -2,6 +2,7 @@ Automake was originally written by David J. MacKenzie <djm@uunet.uu.net>.
 It would not be what it is today without the invaluable help of these
 people:
 
+Andreas Schwab <schwab@lamothe.informatik.uni-dortmund.de>
 Dieter Baron <dillo@stieltjes.smc.univie.ac.at>
 François Pinard <pinard@iro.umontreal.ca>
 Gord Matzigkeit <gord@enci.ucalgary.ca>
diff --git a/lib/mdate-sh b/lib/mdate-sh
index 60293a1f0..0845b8bc8 100755
--- a/lib/mdate-sh
+++ b/lib/mdate-sh
@@ -63,7 +63,7 @@ day=$2
 # Here we have to deal with the problem that the ls output gives either
 # the time of day or the year.
 case $3 in
-  *:*) set `date`; year=$6
+  *:*) set `date`; eval year=\$$#
        case $2 in
 	 Jan) nummonthtod=1;;
 	 Feb) nummonthtod=2;;
diff --git a/mdate-sh b/mdate-sh
index 60293a1f0..0845b8bc8 100755
--- a/mdate-sh
+++ b/mdate-sh
@@ -63,7 +63,7 @@ day=$2
 # Here we have to deal with the problem that the ls output gives either
 # the time of day or the year.
 case $3 in
-  *:*) set `date`; year=$6
+  *:*) set `date`; eval year=\$$#
        case $2 in
 	 Jan) nummonthtod=1;;
 	 Feb) nummonthtod=2;;
diff --git a/tests/ChangeLog b/tests/ChangeLog
index d825fadb9..f468b1fef 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Thu Apr 25 17:12:30 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* extra.test (EXTRA_PROGRAMS): New file.
+
 Tue Apr  9 22:55:07 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* target.test: New file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 02500df12..43caf55fa 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,6 +6,6 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
-target.test
+target.test extra.test
 
 EXTRA_DIST = defs $(TESTS)
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5c4ec1a49..c812e0b15 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -44,7 +44,7 @@ TESTS = mdate.test vtexi.test acoutput.test instexec.test checkall.test \
 acoutnoq.test acouttbs.test libobj.test proginst.test acoutqnl.test \
 confincl.test spelling.test prefix.test badprog.test depend.test exdir.test \
 canon.test installsh.test empty.test rulepat.test insh.test canon2.test \
-target.test
+target.test extra.test
 
 EXTRA_DIST = defs $(TESTS)
 DIST_COMMON = ChangeLog Makefile.am Makefile.in
diff --git a/tests/extra.test b/tests/extra.test
new file mode 100755
index 000000000..014f1713b
--- /dev/null
+++ b/tests/extra.test
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Test to make sure EXTRA_ targets are not generated.
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+bin_PROGRAMS = @foo@
+EXTRA_PROGRAMS = zardoz
+END
+
+$AUTOMAKE || exit 1
+
+grep "^zardoz" Makefile.in && exit 1
+exit 0