Merge branch 'master' of ssh://kerns@bacula.git.sourceforge.net/gitroot/bacula/bacula

[bacula/bacula] / regress / tests / weird-files2-test

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 221abbf0758ceab647267fa3d19d079ad0d715eb..9db7b5695e5b4318490ed8aaa4713c3aa7e58882 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -6,7 +6,6 @@
 TestName="weird-files2-test"
 JobName=weird-files2
 . scripts/functions
-set_debug 0
 
 if test ! -d weird-files ; then
    echo " "
@@ -18,9 +17,9 @@ scripts/cleanup
 scripts/copy-test-confs
 rm -rf weird-files2
 cp -Rp weird-files weird-files2
-echo "${cwd}/weird-files2" >/tmp/file-list
+echo "${cwd}/weird-files2" >${cwd}/tmp/file-list
 cd weird-files2
-perl socket.pl
+#perl socket.pl     # we no longer restore sockets
 cd ..
 
 change_jobname NightlySave $JobName
@@ -36,7 +35,7 @@ label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages
-@$out
+@output
 quit
 END_OF_DATA
 
@@ -66,7 +65,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -77,8 +75,8 @@ stop_bacula
 bin/testls weird-files2 >${cwd}/tmp/restored
 
 check_two_logs
-#diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
-diff ${cwd}/tmp/original ${cwd}/tmp/restored
+diff -u ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
+#diff -u ${cwd}/tmp/original ${cwd}/tmp/restored
 dstat=$?
 
 end_test