diff options
| author | Gary V. Vaughan <gary@gnu.org> | 2013-10-28 10:13:34 +1300 |
|---|---|---|
| committer | Gary V. Vaughan <gary@gnu.org> | 2013-10-28 10:13:34 +1300 |
| commit | 2c8c28acbd60b88d9ce569a169de803182b05af6 (patch) | |
| tree | f51ff3ce5526ba5c62e665a7c4ce6c92c0d458f1 /tests | |
| parent | eea1df80de2239ae2962786cbcb33fa3e3b4533a (diff) | |
| download | libtool-2c8c28acbd60b88d9ce569a169de803182b05af6.tar.gz | |
tests: use autotest as_unset rather than rerolling $unset locally.
On at least Unixware 7.1.4, the shell variable 'unset' gets set
to 'no' during the testsuite run, breaking several test cases.
We should have been using Autotest $as_unset anyway.
* tests/testsuite.at (unset): Remove test and variable setting.
(LT_AT_MAKE): Use $as_unset as provided by autotest boilerplate
instead of our own $unset.
* tests/demo.at (uninstalled libraries ave priority): Likewise.
Reported by Tim Rice.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/demo.at | 2 | ||||
| -rw-r--r-- | tests/testsuite.at | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/demo.at b/tests/demo.at index f1fd9a81..c0a14861 100644 --- a/tests/demo.at +++ b/tests/demo.at @@ -796,7 +796,7 @@ rm -f libhello.la "hell$EXEEXT" # If this check fails (i.e. the make succeeds), then the installed library # was used, which is wrong. -AT_CHECK([$unset LIBTOOL LIBTOOLIZE; $MAKE hell$EXEEXT libhello_la_OBJECTS=hello.lo || (exit 1)], +AT_CHECK([$as_unset LIBTOOL; $as_unset LIBTOOLIZE; $MAKE hell$EXEEXT libhello_la_OBJECTS=hello.lo || (exit 1)], [1], [ignore], [ignore]) AT_CLEANUP diff --git a/tests/testsuite.at b/tests/testsuite.at index ecbdfc22..99122be6 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -51,11 +51,6 @@ fi if test -n "$to_tool_file_cmd"; then configure_options="$configure_options lt_cv_to_tool_file_cmd=$to_tool_file_cmd" fi -if (FOO=bar; unset FOO) >/dev/null 2>&1; then - unset=unset -else - unset=false -fi : ${mkdir_p="$abs_top_srcdir/build-aux/install-sh -d"} # Fix relative paths in $lt_INSTALL case $lt_INSTALL in @@ -193,7 +188,7 @@ m4_define([LT_AT_CONFIGURE], m4_define([LT_AT_MAKE], [for target in m4_default([$1], [all]) do - AT_CHECK([$unset LIBTOOL LIBTOOLIZE; $MAKE $target $2], [0], [ignore], [ignore]) + AT_CHECK([$as_unset LIBTOOL; $as_unset LIBTOOLIZE; $MAKE $target $2], [0], [ignore], [ignore]) done ]) |