Hello Michael,
* Michael Haubenwallner wrote on Sat, Apr 19, 2008 at 11:46:32AM CEST:
> On Fri, 2008-04-18 at 21:24 +0200, Ralf Wildenhues wrote:
> > * Michael Haubenwallner wrote on Fri, Apr 18, 2008 at 04:22:03PM CEST:
> > > [lt-2.2.2-testsuite-usrlocal.patch]
> > > proposed patch to change any default or explicit occurrence of
> > > "/usr/local/*" to "/tmp/nonexistent", although it actually hurts only in
> > > template.at and am-subdir.at (inherits prefix from testsuite.at) here.
> >
> > Why not /nonexistent? Somebody could create /tmp/nonexistent?
> > Or is it that you would like to be able to create it (as non-root)
> > in order to play with Libtool?
>
> Use whatever /nonexistent you want - I've just seen using
> prefix=/tmp/inst in some *.at's, so my mind was accidentally bound
> to /tmp.
Ah, ok. Good thing you mention that. The choice of /tmp/inst in
destdir.at (you must enable that specifically, for safe systems),
is used because the test actually installs stuff there. So it would
not be a good idea to use /tmp/nonexistent there.
I've applied your patch like this, fixing another trivial typo.
Thanks again,
Ralf
2008-04-23 Michael Haubenwallner <[EMAIL PROTECTED]>
Use /nonexistent as destination for files not to be installed.
* tests/darwin.at (darwin fat compile): Fix typo.
* tests/inherited_flags.at (inherited_linker_flags): Change
-rpath to /nonexistent. This helps to avoid accidentally
picking up libraries below /usr/local.
* tests/template.at (simple template test): Likewise. Fixes
test failure for additional incompatible libstdc++ in
/usr/local.
* tests/testsuite.at (configure_options): Add
--prefix=/nonexistent.
diff --git a/tests/darwin.at b/tests/darwin.at
index adc0db6..7e6d07e 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -86,7 +86,7 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libfoo.la
$CPPFLAGS $CFLAGS $LDFL
AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o bar.lo $CPPFLAGS $CFLAGS
-arch ppc -arch i386 bar.c],[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libbar.la $CPPFLAGS $CFLAGS
$LDFLAGS -arch ppc -arch i386 bar.lo libfoo.la -rpath
/nonexistant],[0],[ignore],[ignore])
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC -o libbar.la $CPPFLAGS $CFLAGS
$LDFLAGS -arch ppc -arch i386 bar.lo libfoo.la -rpath
/nonexistent],[0],[ignore],[ignore])
AT_CHECK([$LIBTOOL --mode=compile --tag=CC $CC -c -o main.lo $CPPFLAGS $CFLAGS
-arch ppc -arch i386 main.c],[0],[ignore],[ignore])
diff --git a/tests/inherited_flags.at b/tests/inherited_flags.at
index 7a2fc4e..1efdf16 100644
--- a/tests/inherited_flags.at
+++ b/tests/inherited_flags.at
@@ -1,6 +1,6 @@
# inherited_flags.at -- test inherited_linker_flags -*- Autotest -*-
#
-# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# Written by Peter O'Garman, 2005
#
# This file is part of GNU Libtool.
@@ -56,9 +56,9 @@ $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o
bar.lo bar.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o baz.lo baz.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o both.lo both.c
$LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o main.lo main.c
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libfoo.la foo.lo -rpath
/usr/local/lib -no-undefined
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo -rpath
/usr/local/lib -no-undefined
-$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libboth.la both.lo
-rpath /usr/local/lib -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libfoo.la foo.lo -rpath
/nonexistent -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbar.la bar.lo -rpath
/nonexistent -no-undefined
+$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libboth.la both.lo
-rpath /nonexistent -no-undefined
mv libfoo.la libfoo.la.bak
@@ -73,7 +73,7 @@ mv libboth.la libboth.la.bak
sed -e
"s/^inherited_linker_flags.*/inherited_linker_flags='-llt_inlikely_existing_lib
-llt_unlikely_existing_lib'/g" < libboth.la.bak > libboth.la
rm libboth.la.bak
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la],
[ignore],[stdout],[ignore])
# We used to grep for
# 'llt_[[ui]]nlikely_existing_lib.*llt_[[ui]]nlikely_existing_lib'
@@ -82,19 +82,19 @@ AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS
$LDFLAGS -o libbaz.la baz.lo
AT_CHECK([$LIBTOOL --features | grep 'disable shared libraries' && (exit 77)],
[1], [ignore])
AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib'
stdout],
[0],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_[[ui]]nlikely_existing_lib.*lt_[[ui]]nlikely_existing_lib'
stdout],
[0],[ignore],[ignore])
# now check for duplicates
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la
./libboth.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o libbaz.la
baz.lo -no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
[1],[ignore],[ignore])
AT_CHECK([grep 'lt_unlikely_existing_lib.*lt_unlikely_existing_lib' stdout],
[1],[ignore],[ignore])
-AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /usr/local/lib ./libfoo.la ./libbar.la ./libboth.la],
+AT_CHECK([$LIBTOOL --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -o main main.lo
-no-undefined -rpath /nonexistent ./libfoo.la ./libbar.la ./libboth.la],
[ignore],[stdout],[ignore])
AT_CHECK([grep 'lt_inlikely_existing_lib.*lt_inlikely_existing_lib' stdout],
[1],[ignore],[ignore])
@@ -105,7 +105,7 @@ mv libboth.la libboth.la.bak
sed "s/^inherited_linker_flags.*/inherited_linker_flags='-framework Cocoa
-framework ApplicationServices'/" < libboth.la.bak > libboth.la
rm libboth.la.bak
-AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework
Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la
-no-undefined -rpath /usr/local/lib],
+AT_CHECK([$LIBTOOL -n --mode=link --tag=CC $CC $CFLAGS $LDFLAGS -framework
Cocoa -framework ApplicationServices -o libbaz.la baz.lo libboth.la
-no-undefined -rpath /nonexistent],
[], [stdout], [ignore])
AT_CHECK([grep Cocoa.ltframework stdout], [1], [], [])
AT_CHECK([grep ' -framework Cocoa' stdout], [0], [ignore], [])
diff --git a/tests/template.at b/tests/template.at
index 9fc71f5..cc730ff 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -1,6 +1,6 @@
# template.at -- test C++ templates with libtool -*- Autotest -*-
#
-# Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Markus Christen, 2005
#
# This file is part of GNU Libtool.
@@ -82,7 +82,7 @@ AT_CHECK([$LIBTOOL --tag=CXX --mode=compile $CXX -I.
$CPPFLAGS $CXXFLAGS -c -o a
[0], [ignore], [ignore])
AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libaclib.la aclib.lo],
[0], [ignore], [ignore])
-AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libalib.la -rpath /usr/local/lib alib.lo libaclib.la],
+AT_CHECK([$LIBTOOL --tag=CXX --mode=link $CXX $CPPFLAGS $CXXFLAGS $LDFLAGS -o
libalib.la -rpath /nonexistent alib.lo libaclib.la],
[0], [ignore], [ignore])
AT_CHECK([$CXX -I. $CPPFLAGS $CXXFLAGS -c prog.cpp],
[0], [ignore], [ignore])
diff --git a/tests/testsuite.at b/tests/testsuite.at
index e4cea78..14a604e 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -36,7 +36,7 @@ done
export ACLOCAL AUTOHEADER AUTOCONF AUTOMAKE AUTORECONF
eval `$LIBTOOL --config | grep '^EGREP='`
eval `$LIBTOOL --config | $EGREP
'^(host|host_os|host_alias|build|build_alias|ECHO)='`
-configure_options=
+configure_options=--prefix=/nonexistent
if test -n "$host_alias"; then
configure_options="$configure_options --host $host_alias"
fi
