From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 26 May 2013 20:45:22 +0000 (+0200)
Subject: tests: fix few spurious failures
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=324e4fb8ec7e08c521483f8716f45996fc2db14b;p=thirdparty%2Fautomake.git

tests: fix few spurious failures

* t/subobj-c.sh, t/subobj-libtool.sh,  t/test-extensions-funny-chars.sh:
In these tests.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/t/subobj-c.sh b/t/subobj-c.sh
index e0c2ad2aa..5d7b24a27 100644
--- a/t/subobj-c.sh
+++ b/t/subobj-c.sh
@@ -74,7 +74,7 @@ $AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
 cat stderr >&2
 
 # Make sure compile is installed, and that Automake says so.
-grep '^configure\.ac:7:.*install.*compile' stderr
+grep '^configure\.ac:4:.*install.*compile' stderr
 test -f compile
 
 $EGREP '[^/](a|b|foo)\.\$(OBJEXT)' Makefile.in && exit 1
diff --git a/t/subobj-libtool.sh b/t/subobj-libtool.sh
index 2011d6153..8afad6bfb 100644
--- a/t/subobj-libtool.sh
+++ b/t/subobj-libtool.sh
@@ -58,7 +58,7 @@ $ACLOCAL
 rm -f compile
 $AUTOMAKE --add-missing 2>stderr || { cat stderr >&2; exit 1; }
 cat stderr >&2
-grep '^configure\.ac:7:.*install.*compile' stderr
+grep '^configure\.ac:4:.*install.*compile' stderr
 test -f compile
 
 grep '[^/][123]\.lo' Makefile.in && exit 1
diff --git a/t/test-extensions-funny-chars.sh b/t/test-extensions-funny-chars.sh
index a19f6e80b..33182cb81 100644
--- a/t/test-extensions-funny-chars.sh
+++ b/t/test-extensions-funny-chars.sh
@@ -103,7 +103,7 @@ test ! -f bar.log
 test ! -f baz.log
 test ! -f zardoz.log
 
-run_make -O check TESTS=zardoz L!NU.X_LOG_COMPILER=/bin/sh
+run_make -e IGNORE -O check TESTS=zardoz L!NU.X_LOG_COMPILER=/bin/sh
 count_test_results total=1 pass=0 fail=0 skip=0 xfail=0 xpass=1 error=0
 cat test-suite.log
 test ! -f foo.log
@@ -111,7 +111,7 @@ test ! -f bar.log
 test ! -f baz.log
 cat zardoz.log
 grep 'Hello Zardoz' zardoz.log
-test $am_make_rc -eq 0
+test $am_make_rc -gt 0
 
 run_make -O recheck
 count_test_results total=1 pass=0 fail=0 skip=0 xfail=1 xpass=0 error=0