X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fweird-files2-test;h=9db7b5695e5b4318490ed8aaa4713c3aa7e58882;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=16f9120d579317454a7100d67e079baf5dbd0473;hpb=00a8f284933e0d912ae9588924a6f9a68062bb46;p=bacula%2Fbacula

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 16f9120d57..9db7b5695e 100755
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -17,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
@@ -35,7 +35,7 @@ label storage=File volume=TestVolume001
 run job=$JobName yes
 wait
 messages
-@$out
+@output
 quit
 END_OF_DATA
 
@@ -65,7 +65,6 @@ done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -76,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