From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 21 Mar 2012 20:27:34 +0000 (+0100)
Subject: [ng] tests: fix few failures due to tests expecting old behaviours
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=614c07fa2a4965db7d175e98292db71370b4cd55;p=thirdparty%2Fautomake.git

[ng] tests: fix few failures due to tests expecting old behaviours

Reported by Akim Demaille in a private mail.

* tests/lex-depend.test: Don't expect the '.deps' directory to be
created by config.status, as with mainstream Automake.  This is not
anymore how Automake-NG operates.
* tests/lex-depend-cxx.test: Likewise.
* tests/version4.test (Makefile.am): Adjust the version required
in AUTOMAKE_OPTIONS so that it doesn't trip on the "downgraded"
Automake-NG version (0.5a, while Automake is at 1.11.x).

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

diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
index 52491022b..e0832e08e 100755
--- a/tests/lex-depend-cxx.test
+++ b/tests/lex-depend-cxx.test
@@ -34,7 +34,7 @@ LDADD = $(LEXLIB)
 
 .PHONY: test-deps-exist
 test-deps-exist:
-	ls -l $(DEPDIR) ;: For debugging.
+	ls -l $(DEPDIR)
 	test -f $(DEPDIR)/joe.Po
 	test -f $(DEPDIR)/moe.Po
 
@@ -85,8 +85,8 @@ $AUTOCONF
 # using slow dependency extractors.
 ./configure --enable-dependency-tracking
 
-$MAKE test-deps-exist
 $MAKE
+$MAKE test-deps-exist
 
 : > older
 $sleep
diff --git a/tests/lex-depend.test b/tests/lex-depend.test
index 9487f4a5c..f7cfd6ae5 100755
--- a/tests/lex-depend.test
+++ b/tests/lex-depend.test
@@ -33,7 +33,7 @@ LDADD = $(LEXLIB)
 
 .PHONY: test-deps-exist
 test-deps-exist:
-	ls -l $(DEPDIR) ;: For debugging.
+	ls -l $(DEPDIR)
 	test -f $(DEPDIR)/joe.Po
 
 .PHONY: test-obj-updated
@@ -78,8 +78,8 @@ $AUTOCONF
 # using slow dependency extractors.
 ./configure --enable-dependency-tracking
 
-$MAKE test-deps-exist
 $MAKE
+$MAKE test-deps-exist
 
 : > older
 $sleep
diff --git a/tests/version4.test b/tests/version4.test
index 7fa429e17..c5214ffae 100755
--- a/tests/version4.test
+++ b/tests/version4.test
@@ -19,7 +19,7 @@
 . ./defs || Exit 1
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = 1.4-p3
+AUTOMAKE_OPTIONS = 0.4-p3
 END
 
 $ACLOCAL