mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-01-12 14:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

* tests/dryrun.test: Use cmp instead of diff.

Browse Source 
(before, after): Create them within ../tests.
(libtool): Set to `/bin/sh ./libtool' by default, but use LIBTOOL,
SHELL and top_builddir from the environment if available.  For dry
runs, use "$libtool -n".
* tests/Makefile.am (CLEANFILES): Added before and after.
* ltmain.in: Do not create links to object files in dry runs.
This commit is contained in:
Alexandre Oliva 1999-04-06 23:55:04 +00:00 committed by Alexandre Oliva
parent ba4c36f3cf
commit 1d53527eb7
4 changed files with 47 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
1999-04-06 Alexandre Oliva <oliva@dcc.unicamp.br>
* tests/dryrun.test: Use cmp instead of diff.
(before, after): Create them within ../tests.
(libtool): Set to `/bin/sh ./libtool' by default, but use LIBTOOL,
SHELL and top_builddir from the environment if available. For dry
runs, use "$libtool -n".
* tests/Makefile.am (CLEANFILES): Added before and after.
* ltmain.in: Do not create links to object files in dry runs.
1999-04-06 Thomas Tanner <tanner@gmx.de>
* ltmain.in: added a missing line of the ILD patch

9
ltmain.in
View File

@ -2107,7 +2107,10 @@ EOF
# (e.g. aix) incase we are running --disable-static
for obj in $libobjs; do
oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"`
test -f $oldobj || ${LN_S} $obj $oldobj
if test ! -f $oldobj; then
$show "${LN_S} $obj $oldobj"
$run ${LN_S} $obj $oldobj || exit $?
fi
done
# Use standard objects if they are pic
@ -2904,8 +2907,7 @@ EOF
# Parse the name list into a source file.
$show "creating $objdir/$dlsyms"
if test -z "$run"; then
$echo > "$objdir/$dlsyms" "\
test -z "$run" && $echo > "$objdir/$dlsyms" "\
/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
@ -2918,7 +2920,6 @@ extern \"C\" {
/* External symbol declarations for the compiler. */\
"
fi
if test "$dlself" = yes; then
$show "generating symbol list for \`$output'"

2
tests/Makefile.am
View File

@ -48,6 +48,8 @@ TESTS_ENVIRONMENT = CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
EXTRA_DIST = defs $(TESTS)
CLEANFILES = before after # created by dryrun.test
# We need to remove any files that the above tests created.
clean-local:
-test -f ../cdemo/Makefile && cd ../cdemo && $(MAKE) distclean

56
tests/dryrun.test
View File

@ -19,34 +19,38 @@ fi
# Change to our build directory.
cd ../mdemo || exit 1
before=../tests/before
after=../tests/after
libtool=${LIBTOOL-${SHELL-/bin/sh}\ ${top_builddir-.}/libtool}
echo "= Running $make clean in ../mdemo"
$make clean || exit 1
$make main.o || exit 1
mkdir .libs
rm -f .before .after
rm -f $before $after
echo "= Making object files in ../mdemo"
ls -l . .libs > .before
$make LIBTOOL="libtool -n" foo1.lo foo2.lo || exit 1
ls -l . .libs > .after
diff .before .after > /dev/null || exit 1
ls -l . .libs > $before
$make LIBTOOL="$libtool -n" foo1.lo foo2.lo || exit 1
ls -l . .libs > $after
cmp $before $after > /dev/null || exit 1
# Now really make them
$make foo1.lo foo2.lo || exit 1
echo "= Making libraries in ../mdemo"
ls -l . .libs > .before
$make LIBTOOL="libtool -n" foo1.la libfoo2.la || exit 1
ls -l . .libs > .after
diff .before .after > /dev/null || exit 1
ls -l . .libs > $before
$make LIBTOOL="$libtool -n" foo1.la libfoo2.la || exit 1
ls -l . .libs > $after
cmp $before $after > /dev/null || exit 1
# Now really make them
$make foo1.la libfoo2.la || exit 1
echo "= Making programs in ../mdemo"
ls -l . .libs > .before
$make LIBTOOL="libtool -n" mdemo mdemo.static || exit 1
ls -l . .libs > .after
diff .before .after > /dev/null || exit 1
ls -l . .libs > $before
$make LIBTOOL="$libtool -n" mdemo mdemo.static || exit 1
ls -l . .libs > $after
cmp $before $after > /dev/null || exit 1
# Now really make them
$make mdemo mdemo.static || exit 1
@ -54,31 +58,31 @@ echo "= Running $make install in ../mdemo"
# Libtool does not create these directories
mkdir $prefix/bin
mkdir $prefix/lib
ls -l . .libs > .before
ls -lR $prefix >> .before
$make LIBTOOL="libtool -n" install || exit 1
ls -l . .libs > .after
ls -lR $prefix >> .after
diff .before .after > /dev/null || exit 1
ls -l . .libs > $before
ls -lR $prefix >> $before
$make LIBTOOL="$libtool -n" install || exit 1
ls -l . .libs > $after
ls -lR $prefix >> $after
cmp $before $after > /dev/null || exit 1
# Now really run it
$make install || exit 1
echo "= Running $make uninstall in ../mdemo"
ls -l . .libs > .before
ls -lR $prefix >> .before
ls -l . .libs > $before
ls -lR $prefix >> $before
# Libtool does not uninstall the programs, save them
cp $prefix/bin/mdemo mdemo.sav
cp $prefix/bin/mdemo.static mdemo.static.sav
$make LIBTOOL="libtool -n" uninstall || exit 1
$make LIBTOOL="$libtool -n" uninstall || exit 1
# Restore them
mv mdemo.sav $prefix/bin/mdemo
mv mdemo.static.sav $prefix/bin/mdemo.static
ls -l . .libs > .after
ls -lR $prefix >> .after
diff .before .after > /dev/null || exit 1
ls -l . .libs > $after
ls -lR $prefix >> $after
cmp $before $after > /dev/null || exit 1
# Now really run it
$make uninstall || exit 1
rm -f .before .after
rm -f $before $after
exit 0