From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Wed, 7 Apr 1999 19:36:05 +0000 (+0000)
Subject: * dryrun.test: It would still fail at random times, because `cp'
X-Git-Tag: release-1-3b~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de757d463ed72b460ff859c9a03b449bc11a2397;p=thirdparty%2Flibtool.git

* 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 25b64745f..e24393813 100644
--- 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>
 
 	* NEWS: support for moved libraries
diff --git a/tests/dryrun.test b/tests/dryrun.test
index ce9834c60..5a8d20f14 100755
--- 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