From 614c07fa2a4965db7d175e98292db71370b4cd55 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 21 Mar 2012 21:27:34 +0100 Subject: [PATCH] [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 --- tests/lex-depend-cxx.test | 4 ++-- tests/lex-depend.test | 4 ++-- tests/version4.test | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) 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 -- 2.47.2