Update

[bacula/bacula] / regress / tests / regexwhere-test

diff --git a/regress/tests/regexwhere-test b/regress/tests/regexwhere-test
index 80f15b94f0aabf31a08f58a8a2355c86c828d205..bfc7e486fe468983531000901b49de72a97327d1 100755 (executable)
--- a/regress/tests/regexwhere-test
+++ b/regress/tests/regexwhere-test
@@ -8,12 +8,9 @@ JobName=backup
 
 . scripts/functions
 
-copy_test_confs
+scripts/cleanup
+scripts/copy-test-confs
 
-rm -f bin/bacula-dir.conf
-rm -f tmp/RUN*
-rm -f ${cwd}/build/po/*old*
-rm -rf tmp/po
 /bin/cp -f scripts/bacula-dir.conf.regexwhere bin/bacula-dir.conf
 
 echo "${cwd}/build/po" >/tmp/file-list
@@ -160,9 +157,8 @@ messages
 quit
 END_OF_DATA
 
+run_bacula
 
-bin/bacula start
-cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf > /dev/null
 stop_bacula
 
 
@@ -283,7 +279,7 @@ find ${cwd}/build > tmp/list
 sed -e 's/[Rr][Ee][Aa][Dd][Mm][Ee]/readme/' -e 's/\([ch]\)$/.old.\1/' tmp/list > tmp/list.sed
 ./build/src/tools/bregtest -s -f tmp/list -e '/readme/readme/i,/([ch])$/.old.$1/' > tmp/list.bsed
 
-if diff -q tmp/list.bsed tmp/list.sed
+if diff tmp/list.bsed tmp/list.sed >/dev/null 2>&1
 then
     [ "$debug" = 1 ] && echo bregtest ok
 else