ebl update cancel test

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

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 9971fd44231b29c8d5981ca3fec2b195b357bc99..9a8e1dce3b0964b587ec0b36f456efc6a5f4af84 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 " "
@@ -14,16 +13,19 @@ if test ! -d weird-files ; then
    exit 0
 fi
 cwd=`pwd`
-scripts/copy-test-confs
 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     # we no longer restore sockets
+cd ..
 
 change_jobname NightlySave $JobName
 start_test
 
-bin/testls weird-files2 >${cwd}/tmp/original
+bin/testls weird-files2 | grep -v sock-file >${cwd}/tmp/original
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
@@ -74,7 +76,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 -u ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 >/dev/null
+#diff -u ${cwd}/tmp/original ${cwd}/tmp/restored
 dstat=$?
 
 end_test