From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 8 Jul 2011 07:54:38 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b1eeec164e79a573ed9b92a1599c0d2a9b7f694;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: portability fixes in tests on amhello examples
  remake: add test ensuring that slower remakes don't hang
  remake: fix outdated comment in configure.am
---

2b1eeec164e79a573ed9b92a1599c0d2a9b7f694
diff --cc tests/Makefile.am
index fd50754fe,b545dda55..dd1875e9c
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -831,17 -677,9 +831,18 @@@ remake-subdir-from-subdir.test 
  remake-subdir-gnu.test \
  remake-subdir.test \
  remake-subdir2.test \
+ remake-subdir-long-time.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \
diff --cc tests/Makefile.in
index 306189da5,fe44a40cb..08ac8e89b
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1104,17 -954,9 +1104,18 @@@ remake-subdir-from-subdir.test 
  remake-subdir-gnu.test \
  remake-subdir.test \
  remake-subdir2.test \
+ remake-subdir-long-time.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \