automake-ng
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Automake-NG] [FYI] tests: extra-portability.sh: fix post-merge spurious


From: Stefano Lattarini
Subject: [Automake-NG] [FYI] tests: extra-portability.sh: fix post-merge spurious failure
Date: Sat, 12 Jan 2013 15:00:08 +0100

* t/extra-portability.sh: Adjust to reflect the fact that Automake-NG
supports non-POSIX make variable names like 'foo--bar'.  Instead, use
the fact that the 'aux' directory name is diagnosed as being reserved
on Windows.

Signed-off-by: Stefano Lattarini <address@hidden>
---
 t/extra-portability.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/t/extra-portability.sh b/t/extra-portability.sh
index 1ea23ad..a2df3f3 100755
--- a/t/extra-portability.sh
+++ b/t/extra-portability.sh
@@ -62,31 +62,33 @@ $AUTOMAKE -Wall -Wno-portability
 # Now, a setup where also a "simple" portability warning is present.
 #
 
-echo 'var = $(foo--bar)' >> Makefile.am
+echo 'SUBDIRS = aux' >> Makefile.am
 
 # Enabling extra-portability enables portability as well ...
 AUTOMAKE_fails -Wextra-portability
-grep 'foo--bar' stderr
+grep "'aux'.*reserved on W32" stderr
 grep 'requires.*AM_PROG_AR' stderr
 # ... even if it had been previously disabled.
 AUTOMAKE_fails -Wno-portability -Wextra-portability
-grep 'foo--bar' stderr
+grep "'aux'.*reserved on W32" stderr
 grep 'requires.*AM_PROG_AR' stderr
 
 # Disabling extra-portability leaves portability intact (1).
 AUTOMAKE_fails -Wportability -Wno-extra-portability
-grep 'foo--bar' stderr
+grep "'aux'.*reserved on W32" stderr
 grep 'requires.*AM_PROG_AR' stderr && exit 1
 # Disabling extra-portability leaves portability intact (2).
 AUTOMAKE_fails -Wall -Wno-extra-portability
-grep 'foo--bar' stderr
+grep "'aux'.*reserved on W32" stderr
 grep 'requires.*AM_PROG_AR' stderr && exit 1
 
 # Enabling portability does not enable extra-portability.
 AUTOMAKE_fails -Wportability
-grep 'foo--bar' stderr
+grep "'aux'.*reserved on W32" stderr
 grep 'requires.*AM_PROG_AR' stderr && exit 1
 
+mkdir aux || skip_ "couldn't create directory named 'aux'"
+
 # Disabling portability disables extra-portability.
 $AUTOMAKE -Wno-portability
 $AUTOMAKE -Wextra-portability -Wno-portability
-- 
1.8.1.rc3.192.g2d0029e




reply via email to

[Prev in Thread] Current Thread [Next in Thread]