From 4486c689bd6ef4c5c9aa6e7cabe528df499f33b7 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 25 May 2012 00:19:02 +0200
Subject: [PATCH] tests: don't disable portability warnings when there's no
 need

Some annoying portability warnings only needed for non-GNU makes have
since long been removed in Automake-NG, so they don't have to be
explicitly disabled in tests that checked "unportable" behaviours.

* t/canon5.sh, t/extra11.sh, t/library2.sh, t/pattern-rules2.sh,
t/pluseq7.sh, t/parallel-tests-fork-bomb.sh: Adjust.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---
 t/canon5.sh                   | 2 +-
 t/extra11.sh                  | 2 --
 t/library2.sh                 | 2 +-
 t/parallel-tests-fork-bomb.sh | 2 +-
 t/pattern-rules2.sh           | 4 +++-
 t/pluseq7.sh                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/canon5.sh b/t/canon5.sh
index 4b1b43d8d..8a3f4272e 100755
--- a/t/canon5.sh
+++ b/t/canon5.sh
@@ -52,6 +52,6 @@ bin_PROGRAMS = ,foo
 _foo_SOURCES = foo.c
 END
 
-$AUTOMAKE -Wno-portability
+$AUTOMAKE
 
 :
diff --git a/t/extra11.sh b/t/extra11.sh
index eeec7cddf..b97000d43 100755
--- a/t/extra11.sh
+++ b/t/extra11.sh
@@ -22,8 +22,6 @@
 echo AC_OUTPUT >> configure.ac
 
 cat > Makefile.am <<'END'
-AUTOMAKE_OPTIONS = -Wno-portability
-
 EXTRA_DIST = $(wildcard [!c-z].t d.t [ab].dir foo.* *zardoz*)
 
 .PHONY: prereq
diff --git a/t/library2.sh b/t/library2.sh
index dfa87584c..42a7c62b9 100755
--- a/t/library2.sh
+++ b/t/library2.sh
@@ -27,5 +27,5 @@ EXTRA_LIBRARIES = libfoo.a
 END
 
 $ACLOCAL
-AUTOMAKE_fails -Wno-portability
+AUTOMAKE_fails -Wnone
 grep AC_PROG_RANLIB stderr
diff --git a/t/parallel-tests-fork-bomb.sh b/t/parallel-tests-fork-bomb.sh
index d456ab7a3..7542fb5c0 100755
--- a/t/parallel-tests-fork-bomb.sh
+++ b/t/parallel-tests-fork-bomb.sh
@@ -54,7 +54,7 @@ if (ulimit -t 8); then ulimit -t 8; fi
 
 $ACLOCAL
 $AUTOCONF
-$AUTOMAKE -a -Wno-portability
+$AUTOMAKE -a
 
 ./configure
 
diff --git a/t/pattern-rules2.sh b/t/pattern-rules2.sh
index 07d7a2411..1255f1189 100755
--- a/t/pattern-rules2.sh
+++ b/t/pattern-rules2.sh
@@ -32,4 +32,6 @@ ${ARCH}/%.$(OBJEXT): %.c
 EOF
 
 $ACLOCAL
-$AUTOMAKE -Wno-portability
+$AUTOMAKE
+
+:
diff --git a/t/pluseq7.sh b/t/pluseq7.sh
index 7f5a32ec3..903432fde 100755
--- a/t/pluseq7.sh
+++ b/t/pluseq7.sh
@@ -31,7 +31,7 @@ AR += qq
 END
 
 $ACLOCAL
-AUTOMAKE_fails -Wno-portability
+AUTOMAKE_fails
 q="[\`'\"]"
 grep "^Makefile\.am:3:.* AR .* with $q=$q before .*$q+=$q" stderr
 
-- 
2.47.2