diff -rNu libtool-1.5.26.vanilla/tests/Makefile.in libtool-1.5.26.instd-test/tests/Makefile.in --- libtool-1.5.26.vanilla/tests/Makefile.in 2008-02-01 17:38:41.000000000 +0100 +++ libtool-1.5.26.instd-test/tests/Makefile.in 2008-03-14 10:49:53.244749000 +0100 @@ -184,6 +184,7 @@ demo-inst.test demo-unst.test \ depdemo-static.test depdemo-make.test \ depdemo-exec.test depdemo-inst.test depdemo-unst.test \ + depdemo-instd.test depdemo-unst.test \ mdemo-static.test mdemo-make.test mdemo-exec.test \ mdemo-inst.test mdemo-unst.test \ cdemo-conf.test cdemo-make.test cdemo-exec.test \ @@ -191,6 +192,7 @@ demo-inst.test demo-unst.test deplibs.test \ depdemo-conf.test depdemo-make.test \ depdemo-exec.test depdemo-inst.test depdemo-unst.test \ + depdemo-instd.test depdemo-unst.test \ mdemo-conf.test mdemo-make.test mdemo-exec.test \ mdemo-inst.test mdemo-unst.test dryrun.test \ demo-nofast.test demo-make.test demo-exec.test \ @@ -199,11 +201,13 @@ demo-nopic.test demo-make.test demo-exec.test \ depdemo-nofast.test depdemo-make.test \ depdemo-exec.test depdemo-inst.test depdemo-unst.test \ + depdemo-instd.test depdemo-unst.test \ cdemo-shared.test cdemo-make.test cdemo-exec.test \ demo-shared.test demo-make.test demo-exec.test demo-inst.test \ hardcode.test build-relink.test noinst-link.test demo-unst.test \ depdemo-shared.test depdemo-make.test \ - depdemo-exec.test depdemo-inst.test build-relink2.test \ + depdemo-exec.test depdemo-instd.test depdemo-unst.test \ + depdemo-inst.test build-relink2.test \ depdemo-unst.test \ mdemo-shared.test mdemo-make.test mdemo-exec.test \ mdemo-inst.test mdemo-unst.test \ diff -rNu libtool-1.5.26.vanilla/tests/defs libtool-1.5.26.instd-test/tests/defs --- libtool-1.5.26.vanilla/tests/defs 2005-07-08 17:50:35.000000000 +0200 +++ libtool-1.5.26.instd-test/tests/defs 2008-03-14 10:49:53.254752000 +0100 @@ -42,6 +42,16 @@ prefix=NONE fi +image="./_image" +if test "$need_image" = yes; then + # An absolute path to an image directory. + test -d $image || mkdir $image + image=`cd $image && pwd` +else + test -d $image && rm -rf $image + image= +fi + # Extract CC from the libtool configuration eval `$libtool --config | grep '^CC='` diff -rNu libtool-1.5.26.vanilla/tests/depdemo-instd.test libtool-1.5.26.instd-test/tests/depdemo-instd.test --- libtool-1.5.26.vanilla/tests/depdemo-instd.test 1970-01-01 01:00:00.000000000 +0100 +++ libtool-1.5.26.instd-test/tests/depdemo-instd.test 2008-03-14 10:49:53.264743000 +0100 @@ -0,0 +1,68 @@ +#! /bin/sh +# depdemo-instd.test - try installing from the ../depdemo subdirectory via DESTDIR + +# Test script header. +need_prefix=yes +need_image=yes +if test -z "$srcdir"; then + srcdir=`echo "$0" | sed 's%/[^/]*$%%'` + test "$srcdir" = "$0" && srcdir=. + test "${VERBOSE+set}" != "set" && VERBOSE=yes +fi +. $srcdir/defs || exit 1 + +# Check that things are built. +if test -f ../depdemo/depdemo$EXEEXT; then : +else + echo "You must run depdemo-make.test before $0" 1>&2 + exit 77 +fi + +# Change to our build directory. +cd ../depdemo || exit 1 + +echo "= Running $make install 'DESTDIR=$image' in ../depdemo" +$make install DESTDIR="${image}" || exit 1 + +echo "= Moving out of DESTDIR" + +rm -f fail +{ ( cd "${image}/${prefix}"; tar cf - . ) || touch fail ; } | +{ ( cd "${prefix}" ; tar xfv - ) || touch fail ; } +if [ -f fail ]; then + echo "$0: failed to merge from ${image}/${prefix} to ${prefix}" 1>&2 + rm -f fail + exit 1 +fi +rm -rf "${image}/${prefix}" +leftovers=`find "${image}" ! -type d ! -name '.*' -print` +if test -n "$leftovers"; then + echo "= Leftover after merging from ${image}/${prefix}:" + ls -l $leftovers + ls -l $leftovers > ~/devel/savannah/arse + exit 1 +fi +rm -rf "${image}" + +echo "= Executing installed programs" + +status=0 +if $prefix/bin/depdemo_static; then : +else + echo "$0: cannot execute $prefix/bin/depdemo_static" 1>&2 + status=1 +fi + +if $prefix/bin/depdemo; then : +else + echo "$0: cannot execute $prefix/bin/depdemo" 1>&2 + + # Simple check to see if they are superuser. + if test -w /; then : + else + echo "You may need to run $0 as the superuser." + fi + status=1 +fi + +exit $status