[Automake-commit] [SCM] GNU Automake branch, ng/master, updated. ng-0.5a-141-g614c07f

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=614c07fa2a4965db7d175e98292db71370b4cd55

The branch, ng/master has been updated
       via  614c07fa2a4965db7d175e98292db71370b4cd55 (commit)
       via  b285b0ac8f949b28091ecd44e6036dc9040ae674 (commit)
       via  4586d24dc7598c177939df2db65e1b0cbc060757 (commit)
       via  4ef91d38b82d5e380ea258399c31a52dc3f282d6 (commit)
       via  abf40ce23d53ae93e995d3b85398ec11d8d59706 (commit)
      from  c98ed25fae15d4c8dcbd61cb0b07c1bef79145ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 614c07fa2a4965db7d175e98292db71370b4cd55
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 21 21:27:34 2012 +0100

    [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 <address@hidden>

commit b285b0ac8f949b28091ecd44e6036dc9040ae674
Merge: c98ed25 4586d24
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 21 20:59:19 2012 +0100

    Merge branch 'master' into ng/master
    
    Signed-off-by: Stefano Lattarini <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 tests/Makefile.am         |   27 ---------------------------
 tests/lex-depend-cxx.test |    4 ++--
 tests/lex-depend.test     |    4 ++--
 tests/list-of-tests.mk    |   30 ++++++++++++++++++++++++++++++
 tests/version4.test       |    2 +-
 5 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 33ef172..fc35610 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,33 +32,6 @@ EXTRA_DIST = ax/is ChangeLog-old
 
 TESTS = ## Will be updated later.
 
-XFAIL_TESTS = \
-all.test \
-yacc-bison-skeleton-cxx.test \
-yacc-bison-skeleton.test \
-cond17.test \
-gcj6.test \
-interp3.test \
-override-conditional-2.test \
-dist-pr109765.test \
-instdir-cond2.test \
-java-nobase.test \
-objext-pr10128.test \
-parallel-tests-many.test \
-pr8365-remake-timing.test \
-remake-am-pr10111.test \
-remake-m4-pr10111.test \
-txinfo5.test \
-## FIXME: this "expected failures" are in truth an hack used to
-## FIXME: to verify that some incorrect usages of our perl: libraries
-## FIXME: raise an error.  We should find a cleaner way to check that.
-pm/Cond2.pl \
-pm/Cond3.pl \
-pm/DisjCon2.pl \
-pm/DisjCon3.pl \
-pm/Version2.pl \
-pm/Version3.pl
-
 # Some testsuite-influential variables should be overridable from the
 # test scripts, but not from the environment.
 AM_TESTS_ENVIRONMENT = \
diff --git a/tests/lex-depend-cxx.test b/tests/lex-depend-cxx.test
index 5249102..e0832e0 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 9487f4a..f7cfd6a 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/list-of-tests.mk b/tests/list-of-tests.mk
index 5a05b1e..1b8c68f 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -17,6 +17,36 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# FIXME: this "expected failures" are in truth an hack used to
+# FIXME: to verify that some incorrect usages of our perl libraries
+# FIXME: raise an error.  We should find a cleaner way to check that.
+perl_fake_XFAIL_TESTS = \
+pm/Cond2.pl \
+pm/Cond3.pl \
+pm/DisjCon2.pl \
+pm/DisjCon3.pl \
+pm/Version2.pl \
+pm/Version3.pl
+
+XFAIL_TESTS = \
+all.test \
+yacc-bison-skeleton-cxx.test \
+yacc-bison-skeleton.test \
+cond17.test \
+gcj6.test \
+interp3.test \
+override-conditional-2.test \
+dist-pr109765.test \
+instdir-cond2.test \
+java-nobase.test \
+objext-pr10128.test \
+parallel-tests-many.test \
+pr8365-remake-timing.test \
+remake-am-pr10111.test \
+remake-m4-pr10111.test \
+txinfo5.test \
+$(perl_fake_XFAIL_TESTS)
+
 perl_TESTS = \
 pm/Cond2.pl \
 pm/Cond3.pl \
diff --git a/tests/version4.test b/tests/version4.test
index 7fa429e..c5214ff 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


hooks/post-receive
-- 
GNU Automake