X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fweird-files-test;h=920ca7c60a8d822cc1aa87736df84559e7572ffe;hb=2e5e66ecd7f814cdee43f1b93ac4085fcc9ac875;hp=4174ec43718d173b1d09772d2c8ae0e220376175;hpb=0830bb18ada29945abbd1aebaad51c424d7d4593;p=bacula%2Fbacula

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index 4174ec4371..920ca7c60a 100755
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -6,7 +6,6 @@
 TestName="weird-files-test"
 JobName=wierd-files
 . scripts/functions
-set_debug 0
 
 if test ! -d weird-files ; then
    echo " "
@@ -15,17 +14,22 @@ if test ! -d weird-files ; then
 fi
 
 cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-change_jobname $JobName
+scripts/copy-test-confs
+change_jobname NightlySave $JobName
 #
 # Note, we save the weird-files directory twice on purpose
 #  because this causes problems with hard linked files 
 #  that are only saved once.  In 1.33, Bacula now deals
 #  with this situation.
 #
-echo "${cwd}/weird-files" >/tmp/file-list
-echo "${cwd}/weird-files" >>/tmp/file-list
+echo "${cwd}/weird-files" >${cwd}/tmp/file-list
+echo "${cwd}/weird-files" >>${cwd}/tmp/file-list
+
+# Create a Unix domain socket (sock-file)
+cd weird-files
+perl socket.pl
+cd ..
 
 start_test
 
@@ -57,6 +61,10 @@ 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
 
 ${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original
 cd tmp/bacula-restores${cwd}
@@ -64,6 +72,7 @@ ${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored
 cd ${cwd}
 
 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