summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2011-01-15 13:06:21 +0100
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2011-01-15 13:06:21 +0100
commit2525b56bdeebf8327c49b921b7a1fefaed45d087 (patch)
tree622e5856c53d835b80d93e485f91e9e2ff800e40
parent0e444f5394c435dc55a9ba061224b6a6040042f9 (diff)
parent63c34882ee4216d688f47d8f357d0a75e87fc521 (diff)
downloadautomake-2525b56bdeebf8327c49b921b7a1fefaed45d087.tar.gz
Merge branch 'fix-libobj-tests'
* fix-libobj-tests: Fix libobj2.test failure with non-GNU make: define $(AR).
-rw-r--r--ChangeLog5
-rwxr-xr-xtests/libobj2.test1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a1f6f111..17a064c02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-01-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ Fix libobj2.test failure with non-GNU make: define $(AR).
+ * tests/libobj2.test: Ensure $(AR) is suitably defined.
+
+2011-01-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
tests: avoid spurious failures due to fork failure in test setup
* tests/defs: Ensure $me is always nonempty, to avoid spurious
failures on MinGW/MSYS in case the preceding sed command could
diff --git a/tests/libobj2.test b/tests/libobj2.test
index 3b3ec9828..66ca0d04e 100755
--- a/tests/libobj2.test
+++ b/tests/libobj2.test
@@ -24,6 +24,7 @@ cat >> configure.in << 'END'
AC_CONFIG_FILES([subdir/Makefile])
AC_PROG_CC
AC_PROG_RANLIB
+AC_CHECK_TOOLS([AR], [ar])
AC_LIBOBJ([fsusage])
AC_OUTPUT
END