]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
[ng] tests: fix few failures due to tests expecting old behaviours
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Mar 2012 20:27:34 +0000 (21:27 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Mar 2012 20:29:36 +0000 (21:29 +0100)
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>
tests/lex-depend-cxx.test
tests/lex-depend.test
tests/version4.test

index 52491022ba730738b0f1685c257cdd92ce2855c8..e0832e08ea72b274cedb8059f8499de9b96f9373 100755 (executable)
@@ -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
index 9487f4a5c99dfcb6986ffcec8c53348a0c8cb0ab..f7cfd6ae53eb03e965730867815c54d5131a8305 100755 (executable)
@@ -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
index 7fa429e179cee2c6cf3271b325f62bad94fdec8e..c5214ffaedc623b8dab2046054317e5c89f0ea89 100755 (executable)
@@ -19,7 +19,7 @@
 . ./defs || Exit 1
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = 1.4-p3
+AUTOMAKE_OPTIONS = 0.4-p3
 END
 
 $ACLOCAL