summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-05-15 15:48:08 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2013-05-24 17:35:48 +0200
commitb2b6269fca6f7bb7adac2d09c02adf0c6b701d48 (patch)
tree862ba417a38838ad28acb999fe8ddeb045c4696f
parente90126cf20ab1bd848631fca5d4bc32433ca52e4 (diff)
downloadautomake-b2b6269fca6f7bb7adac2d09c02adf0c6b701d48.tar.gz
tests: some tests make no sense if "$CC -c -o" doesn't work
So just skip them, to avoid spurious failures when running "make check-no-cc-c-o". * t/ax/am-test-lib.sh (require_tool): New requirement '-c-o'. * t/subobj10.sh ($required): Add it. * gen-testsuite-part (%depmodes): Adjust so that tests that use 'makedepend' will be skipped if the compiler is being forced not to grasp "-c -o". Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rwxr-xr-xgen-testsuite-part2
-rw-r--r--t/ax/am-test-lib.sh5
-rw-r--r--t/subobj10.sh2
3 files changed, 7 insertions, 2 deletions
diff --git a/gen-testsuite-part b/gen-testsuite-part
index 4584d2b8e..3bd5c9f01 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -342,7 +342,7 @@ my %depmodes =
(
auto => ["cc"],
disabled => ["cc"],
- makedepend => ["cc", "makedepend"],
+ makedepend => ["cc", "makedepend", "-c-o"],
dashmstdout => ["gcc"],
cpp => ["gcc"],
# This was for older (pre-3.x) GCC versions (newer versions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 53dd27ee5..07ef9c9f8 100644
--- a/t/ax/am-test-lib.sh
+++ b/t/ax/am-test-lib.sh
@@ -765,6 +765,11 @@ require_tool ()
case $1 in
cc|c++|fortran|fortran77)
require_compiler_ $1;;
+ -c-o)
+ if test x"$AM_TESTSUITE_SIMULATING_NO_CC_C_O" = x"yes"; then
+ skip_all_ "need a C compiler that grasps -c and -o together"
+ fi
+ ;;
xsi-lib-shell)
if test x"$am_test_prefer_config_shell" = x"yes"; then
require_xsi "$SHELL"
diff --git a/t/subobj10.sh b/t/subobj10.sh
index 1be42a95a..f3181d173 100644
--- a/t/subobj10.sh
+++ b/t/subobj10.sh
@@ -16,7 +16,7 @@
# PR 492: Test asm subdir-objects.
-required=gcc
+required='gcc -c-o'
. test-init.sh
cat > configure.ac << END