X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fweird-files2-test;h=9a8e1dce3b0964b587ec0b36f456efc6a5f4af84;hb=28b32f20b7278613564755efe4ac7800fcb89bf0;hp=ec328155dd92000853b5c5361045f0a477c31b03;hpb=6a8eafaf4e7f1224125927475704534694ad4cd0;p=bacula%2Fbacula diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test index ec328155dd..9a8e1dce3b 100755 --- 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,12 +17,15 @@ 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 <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