diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-21 15:35:04 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-02-21 15:35:04 +0100 |
| commit | a8933e87ca570f3e710559b12cddad4473525c19 (patch) | |
| tree | 923aeded098771ed36ca4ba13ce01b157a1e4300 /t/aclocal-macrodir.tap | |
| parent | b7ac9a37b3c7c78db1ba2beb32cf10bda9db996b (diff) | |
| parent | 7a3d7cee2b3270443bcd3b91e7e4ada8a1a858a1 (diff) | |
| download | automake-a8933e87ca570f3e710559b12cddad4473525c19.tar.gz | |
Merge branch 'fix-pr13514' into branch-1.13.2
* fix-pr13514:
aclocal: fix for more-than-once specified directories
aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
Diffstat (limited to 't/aclocal-macrodir.tap')
| -rwxr-xr-x | t/aclocal-macrodir.tap | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/t/aclocal-macrodir.tap b/t/aclocal-macrodir.tap index 44af05fa9..fb8060968 100755 --- a/t/aclocal-macrodir.tap +++ b/t/aclocal-macrodir.tap @@ -20,7 +20,7 @@ am_create_testdir=empty . test-init.sh -plan_ 6 +plan_ 7 ocwd=$(pwd) || fatal_ "getting current working directory" ACLOCAL_PATH=; unset ACLOCAL_PATH @@ -157,16 +157,44 @@ test_end #--------------------------------------------------------------------------- -test_begin "AC_CONFIG_MACRO_DIR([non-existent]) errors out (1)" +test_begin "AC_CONFIG_MACRO_DIR([non-existent]) warns with -Wunsupported" cat > configure.ac << 'END' AC_INIT([oops], [1.0]) AC_CONFIG_MACRO_DIR([non-existent]) +AM_INIT_AUTOMAKE END -not $ACLOCAL -Wnone 2>stderr \ +$ACLOCAL -Wno-error 2>stderr \ && cat stderr >&2 \ && grep "couldn't open directory 'non-existent'" stderr \ + && test -f aclocal.m4 \ + || r='not ok' + +rm -rf aclocal.m4 autom4te*.cache + +$ACLOCAL -Werror -Wno-unsupported \ + && test -f aclocal.m4 \ + || r='not ok' + +test_end + +#--------------------------------------------------------------------------- + +test_begin "AC_CONFIG_MACRO_DIR([not-exist]) and ACLOCAL_AMFLAGS = -I not-exist" + +cat > configure.ac << 'END' +AC_INIT([oops], [1.0]) +AC_CONFIG_MACRO_DIR([not-exist]) +END + +cat > Makefile.am << 'END' +ACLOCAL_AMFLAGS = -I not-exist +END + +$ACLOCAL -Wno-error 2>stderr \ + && cat stderr >&2 \ + && test $(grep -c "couldn't open directory 'not-exist'" stderr) -eq 1 \ || r='not ok' test_end |