From: Stefano Lattarini Date: Sat, 12 Jan 2013 13:59:49 +0000 (+0100) Subject: tests: extra-portability.sh: fix post-merge spurious failure X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d40a7913b4056dcaefadfbcbb93154704ac2458;p=thirdparty%2Fautomake.git tests: extra-portability.sh: fix post-merge spurious failure * 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 --- diff --git a/t/extra-portability.sh b/t/extra-portability.sh index 1ea23ad75..a2df3f3e6 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