* dryrun.test: It would still fail at random times, because `cp'

and `mv' are not guaranteed to preserve the timestamps of the
installed files.  Instead of preserving them, just remove them
before the dry uninstall test.  Redirect dry-run output to stderr,
so that it can be easily separated from the regular output.

diff --git a/ChangeLog b/ChangeLog
index b3a44f188b586ad06567f96fd6e97601bb52a18f..232e36339d58fd7db5922386d2d30fede85684b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-04-07  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * dryrun.test: It would still fail at random times, because `cp'
+       and `mv' are not guaranteed to preserve the timestamps of the
+       installed files.  Instead of preserving them, just remove them
+       before the dry uninstall test.  Redirect dry-run output to stderr, 
+       so that it can be easily separated from the regular output.
+
 1999-04-07 Thomas Tanner  <tanner@gmx.de>
 
        * libtool.m4: another DJGPP fix

diff --git a/tests/dryrun.test b/tests/dryrun.test
index ce9834c60eb79e4f494166e321c2afb16ab016ee..5a8d20f1473917beda56999009eadda5e1dda59b 100755 (executable)
--- a/tests/dryrun.test
+++ b/tests/dryrun.test
@@ -45,57 +45,58 @@ mv $objdir/libtool.new libtool
 # sure it is up-to-date
 $make main.o || exit 1
 
-echo "= Making object files in ../mdemo"
+echo "= Making object files in ../mdemo (dry run)"
 ls -l . $objdir > $before
 force_dry_run=yes $make foo1.lo foo2.lo || exit $?
 ls -l . $objdir > $after
 cmp $before $after > /dev/null || exit 1
 # Now really make them
+echo "= Making object files in ../mdemo"
 $make foo1.lo foo2.lo || exit 1
 
-echo "= Making libraries in ../mdemo"
+echo "= Making libraries in ../mdemo (dry run)"
 ls -l . $objdir > $before
 force_dry_run=yes $make foo1.la libfoo2.la || exit $?
 ls -l . $objdir > $after
 cmp $before $after > /dev/null || exit 1
 # Now really make them
+echo "= Making libraries in ../mdemo"
 $make foo1.la libfoo2.la || exit 1
 
-echo "= Making programs in ../mdemo"
+echo "= Making programs in ../mdemo (dry run)"
 ls -l . $objdir > $before
-force_dry_run=yes $make mdemo mdemo.static || exit $?
+force_dry_run=yes $make mdemo mdemo.static 1>&2 || exit $?
 ls -l . $objdir > $after
 cmp $before $after > /dev/null || exit 1
 # Now really make them
+echo "= Making programs in ../mdemo"
 $make mdemo mdemo.static || exit 1
 
-echo "= Running $make install in ../mdemo"
+echo "= Running $make install in ../mdemo (dry run)"
 # Libtool does not create these directories
 mkdir $prefix/bin
 mkdir $prefix/lib
 ls -l . $objdir > $before
 ls -lR $prefix >> $before
-force_dry_run=yes $make install || exit 1
+force_dry_run=yes $make install 1>&2 || exit 1
 ls -l . $objdir > $after
 ls -lR $prefix >> $after
 cmp $before $after > /dev/null || exit 1
 # Now really run it
+echo "= Running $make install in ../mdemo"
 $make install || exit 1
 
-echo "= Running $make uninstall in ../mdemo"
+echo "= Running $make uninstall in ../mdemo (dry run)"
+# Libtool does not uninstall the programs, remove them first
+rm -f $prefix/bin/mdemo $prefix/bin/mdemo.static
 ls -l . $objdir > $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
-force_dry_run=yes $make uninstall || exit $?
-# Restore them
-mv mdemo.sav $prefix/bin/mdemo
-mv mdemo.static.sav $prefix/bin/mdemo.static
+force_dry_run=yes $make uninstall 1>&2 || exit $?
 ls -l . $objdir > $after
 ls -lR $prefix >> $after
 cmp $before $after > /dev/null || exit 1
 # Now really run it
+echo "= Running $make uninstall in ../mdemo"
 $make uninstall || exit 1
 
 rm -f $before $after libtool