[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2093-g4ef91d3

[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=4ef91d38b82d5e380ea258399c31a52dc3f282d6

The branch, master has been updated
       via  4ef91d38b82d5e380ea258399c31a52dc3f282d6 (commit)
       via  abf40ce23d53ae93e995d3b85398ec11d8d59706 (commit)
      from  a5062ef4d7b65807bc0dea406e2e7807d83c6a3b (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 4ef91d38b82d5e380ea258399c31a52dc3f282d6
Merge: a5062ef abf40ce
Author: Stefano Lattarini <address@hidden>
Date:   Wed Mar 21 20:35:24 2012 +0100

    Merge branch 'maint'
    
    * maint:
      maint: move definition of XFAIL_TESTS near TESTS
    
    Actually, after the trivial merge conflicts have been solved, what
    this change actually does is moving the definition of XFAIL_TESTS
    near that of handwritten_TESTS.  But the rationale is the same of
    that of commit 'v1.11-761-gabf40ce' (being merged here), and still
    works, so all is good.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 tests/Makefile.am      |   27 ---------------------------
 tests/list-of-tests.mk |   27 +++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index baebb1f..8901155 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 \
-override-conditional-2.test \
-dist-pr109765.test \
-instdir-cond2.test \
-java-nobase.test \
-objext-pr10128.test \
-parallel-tests-many.test \
-pr8365-remake-timing.test \
-lex-subobj-nodep.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/list-of-tests.mk b/tests/list-of-tests.mk
index c00b571..ec0f5f3 100644
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@ -17,6 +17,33 @@
 ## You should have received a copy of the GNU General Public License
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+XFAIL_TESTS = \
+all.test \
+yacc-bison-skeleton-cxx.test \
+yacc-bison-skeleton.test \
+cond17.test \
+gcj6.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 \
+lex-subobj-nodep.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
+
 perl_TESTS = \
 pm/Cond2.pl \
 pm/Cond3.pl \


hooks/post-receive
-- 
GNU Automake