From: Gary V. Vaughan Date: Thu, 25 Oct 2012 11:28:57 +0000 (-0500) Subject: tests: fixup experr for addition whitespace in error prefix. X-Git-Tag: v2.4.2.418~86 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d7e7ec0e12144ff450ac822e096cb3047de7d9c;p=thirdparty%2Flibtool.git tests: fixup experr for addition whitespace in error prefix. Fix spurious test failures due to unmatched experr output. * tests/libtoolize.at, tests/old-ltdl-iface.at: Add the addition 2 spaces now used to justify error prefixes. Signed-off-by: Gary V. Vaughan --- diff --git a/tests/libtoolize.at b/tests/libtoolize.at index ea7265b1d..187ba8e45 100644 --- a/tests/libtoolize.at +++ b/tests/libtoolize.at @@ -115,7 +115,7 @@ AT_DATA([Makefile.am], ]]) AT_DATA(experr, -[[libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I me2. +[[libtoolize: error: AC_CONFIG_MACRO_DIRS([m4]) conflicts with ACLOCAL_AMFLAGS=-I me2. ]]) LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr) @@ -241,8 +241,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4' ]]) AT_DATA(experr, -[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite -libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite +[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite +libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite ]]) LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr) @@ -255,8 +255,8 @@ LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr) : >expout AT_DATA(experr, -[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite -libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite +[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite +libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite ]]) LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr) @@ -318,8 +318,8 @@ libtoolize: copying file 'm4/lt~obsolete.m4' ]]) AT_DATA(experr, -[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite -libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite +[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite +libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite ]]) LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, experr) @@ -332,8 +332,8 @@ LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, experr) : >expout AT_DATA(experr, -[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite -libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite +[[libtoolize: error: 'build-aux/ltmain.sh' is newer: use '--force' to overwrite +libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite ]]) LT_AT_CHECK_LIBTOOLIZE([--copy --install], 0, expout, experr) @@ -716,7 +716,7 @@ libtoolize: copying file 'm4/libtool.m4' ]]) AT_DATA([experr], -[[libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite +[[libtoolize: error: 'm4/ltoptions.m4' is newer: use '--force' to overwrite ]]) LT_AT_CHECK_LIBTOOLIZE([--copy], 0, expout, experr) @@ -1104,7 +1104,7 @@ LIBTOOLIZE_OPTIONS=narf export LIBTOOLIZE_OPTIONS AT_DATA(experr, -[[libtoolize: error: garbled LIBTOOLIZE_OPTIONS near 'narf' +[[libtoolize: error: garbled LIBTOOLIZE_OPTIONS near 'narf' ]]) LT_AT_CHECK_LIBTOOLIZE([--copy], 1, [ignore], experr) diff --git a/tests/old-ltdl-iface.at b/tests/old-ltdl-iface.at index 8f3a28eeb..6bf94e6b8 100644 --- a/tests/old-ltdl-iface.at +++ b/tests/old-ltdl-iface.at @@ -124,7 +124,7 @@ libtoolize: Consider updating to use of 'include ltdl/ltdl.mk' in Makefile.am. ]]) AT_DATA([experr], -[[libtoolize: error: Use of 'include ltdl/Makefile.inc' is deprecated! +[[libtoolize: error: Use of 'include ltdl/Makefile.inc' is deprecated! ]]) LT_AT_CHECK_LIBTOOLIZE([--ltdl=ltdl --nonrecursive --install], 0, [expout], [experr])