From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 23 Jun 2010 12:50:47 +0000 (+0200)
Subject: regress: replace testls by diff.pl in weird-files-test
X-Git-Tag: Release-7.0.0~1707
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5bad1f8d1658698968787d262105e44d28af7186;p=bacula%2Fbacula

regress: replace testls by diff.pl in weird-files-test
---

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 2292a3ac7d..4bc02c675b 100755
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -60,32 +60,20 @@ END_OF_DATA
 run_bacula
 check_for_zombie_jobs storage=File 
 stop_bacula
+
 # Note, the Unix domain socket (sock-file) is not restored
-#  by Bacula so we delete it for the diffs
-rm -f weird-files/sock-file
-touch weird-files tmp/bacula-restores${cwd}/weird-files
+#  by Bacula so we delete it for the diffs. diff.pl already discards them
+# rm -f weird-files/sock-file
+
+# to have the same mtime after the rm, we need to touch directories
+# touch weird-files tmp/bacula-restores${cwd}/weird-files
+
 
-${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original
-cd tmp/bacula-restores${cwd}
-${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored
-cd ${cwd}
+$rscripts/diff.pl -s weird-files -d tmp/bacula-restores${cwd}/weird-files > tmp/diff.out
+dstat=$?
 
 check_two_logs
 if test "$debug" -eq 1; then
-  diff -u ${cwd}/tmp/original ${cwd}/tmp/restored
-  dstat=$?
-  if [ $dstat != 0 ] ; then
-     echo " "
-     echo "===== Original ======"
-     cat ${cwd}/tmp/original
-     echo "====="
-     echo " "
-     echo "===== Restored ======"
-     cat ${cwd}/tmp/restored
-     echo "====="
-  fi
-else
-  diff -u ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
-  dstat=$?
+  cat tmp/diff.out
 fi
 end_test