summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-04-18 18:04:12 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-04-18 18:04:30 +0200
commit97f2a6db3379ffaa3a21ea590b09710dc25b264e (patch)
tree9e638a242b9fd62d86d7cd8f6d2087bc373e8abb
parent41f418b0787c7b574fa702fb1f14546ada4eadc2 (diff)
downloadautomake-97f2a6db3379ffaa3a21ea590b09710dc25b264e.tar.gz
tests: avoid spurious failures when cross-compiling
* t/parallel-tests-recheck-depends-on-all.sh: Skip the test when cross-compiling. * t/vala-vapi.sh: Skip tests that do not make sense when cross-compiling. * t/yacc-basic.sh: Likewise. * t/yacc-cxx.sh: Likewise. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
-rwxr-xr-xt/parallel-tests-recheck-depends-on-all.sh2
-rwxr-xr-xt/vala-vapi.sh4
-rwxr-xr-xt/yacc-basic.sh5
-rwxr-xr-xt/yacc-cxx.sh12
4 files changed, 12 insertions, 11 deletions
diff --git a/t/parallel-tests-recheck-depends-on-all.sh b/t/parallel-tests-recheck-depends-on-all.sh
index cec66ae24..6c9e4cba9 100755
--- a/t/parallel-tests-recheck-depends-on-all.sh
+++ b/t/parallel-tests-recheck-depends-on-all.sh
@@ -18,7 +18,7 @@
# See automake bug#11252.
am_parallel_tests=yes
-required=cc
+required='cc native'
. ./defs || Exit 1
cat >> configure.ac << 'END'
diff --git a/t/vala-vapi.sh b/t/vala-vapi.sh
index 7ad8742d7..8df859998 100755
--- a/t/vala-vapi.sh
+++ b/t/vala-vapi.sh
@@ -72,7 +72,7 @@ $MAKE
ls -l # For debugging.
cat zardoz.c # Likewise.
grep 'BARBAR' zardoz.c
-$MAKE test1
+cross_compiling || $MAKE test1 || Exit 1
# Simple check on remake rules.
$sleep
@@ -83,7 +83,7 @@ sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99
$MAKE
cat zardoz.c # For debugging.
grep 'BAZBAZ' zardoz.c
-$MAKE test2
+cross_compiling || $MAKE test2 || Exit 1
# Check the distribution.
$MAKE distcheck
diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh
index 71a17e58e..d2fd49061 100755
--- a/t/yacc-basic.sh
+++ b/t/yacc-basic.sh
@@ -70,12 +70,11 @@ test -f bar-parse.output
if cross_compiling; then :; else
echo a | ./foo
echo b | ./foo && Exit 1
+ echo a | ./bar
+ echo b | ./bar && Exit 1
: For shells with busted 'set -e'.
fi
-echo a | ./bar
-echo b | ./bar && Exit 1
-
# The Yacc-derived C sources must be shipped.
$MAKE echo-distcom
$MAKE -s echo-distcom | grep '[ /]parse\.c '
diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
index fe348cb20..2af22eee7 100755
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.sh
@@ -88,11 +88,13 @@ test -f foo4-parse4.cpp
test -f foo3-parse3.output
test -f foo4-parse4.output
-for i in 1 2 3 4; do
- echo a | ./foo$i
- echo b | ./foo$i && Exit 1
- : For shells with busted 'set -e'.
-done
+if cross_compiling; then :; else
+ for i in 1 2 3 4; do
+ echo a | ./foo$i
+ echo b | ./foo$i && Exit 1
+ : For shells with busted 'set -e'.
+ done
+fi
# The Yacc-derived C++ sources must be shipped.
$MAKE echo-distcom