update

[bacula/bacula] / regress / tests / strip-test

diff --git a/regress/tests/strip-test b/regress/tests/strip-test
index 68a3d689319b20bc2306d26dc819ed3518055417..e129fad8f94b37a12ddac814eb47a266dd5f9799 100755 (executable)
--- a/regress/tests/strip-test
+++ b/regress/tests/strip-test
@@ -10,7 +10,10 @@ scripts/cleanup
 scripts/copy-strip-confs
 
 
-echo "${cwd}/build/src/dird" >${cwd}/tmp/file-list
+rm -rf /tmp/$$-strip
+mkdir /tmp/$$-strip
+cp -rpf ${cwd}/build/src/dird/ /tmp/$$-strip/
+echo "/tmp/$$-strip" >${cwd}/tmp/file-list
 
 change_jobname NightlySave $JobName
 start_test
@@ -21,7 +24,7 @@ messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=150 dir
 @#setdebug level=150 storage=FileStorage
-setdebug level=100 client
+setdebug level=100 client=$CLIENT
 label storage=FileStorage pool=Default volume=TestVolume001
 run job=$JobName storage=FileStorage pool=Default yes
 wait
@@ -39,7 +42,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-@#setdebug level=50 client
+@#setdebug level=50 client=$CLIENT
 restore where=${cwd}/tmp/bacula-restores select all storage=FileStorage done
 yes
 wait
@@ -54,6 +57,17 @@ check_for_zombie_jobs storage=FileStorage
 stop_bacula
 
 check_two_logs
-# check_restore_diff does not work because we cannot read all /etc, so skip it
-dstat=0
+#
+# Kludge remove this next line when strip is fixed
+#
+rm -rf tmp/bacula-restores/tmp
+if test "$debug" -eq 1 ; then
+   diff -ur /tmp/$$-strip/dird/ tmp/bacula-restores/
+else 
+   diff -r /tmp/$$-strip/dird/ tmp/bacula-restores/ 2>&1 >/dev/null
+fi
+dstat=$?
+
+rm -rf /tmp/$$-strip
+
 end_test