diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup index d63a52e..b1b14e0 100755 --- a/regress/scripts/cleanup +++ b/regress/scripts/cleanup @@ -22,8 +22,8 @@ if [ -d ${bin} ] ; then ${bin}/bacula stop 2>&1 >/dev/null fi cd ${scripts} - ./drop_bacula_tables >/dev/null 2>&1 - ./make_bacula_tables >/dev/null 2>&1 + ./drop_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 + ./make_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 ./grant_bacula_privileges >/dev/null 2>&1 cd ${cwd} fi diff --git a/regress/scripts/setup b/regress/scripts/setup index 0a9311c..f80d9c5 100755 --- a/regress/scripts/setup +++ b/regress/scripts/setup @@ -71,10 +71,10 @@ bin/bacula stop mkdir -p working cd bin echo "Running database creation scripts" -./create_bacula_database -./drop_bacula_tables -./make_bacula_tables -./grant_bacula_privileges +./create_bacula_database --defaults-file=${cwd}/regressmysql.cnf +./drop_bacula_tables --defaults-file=${cwd}/regressmysql.cnf +./make_bacula_tables --defaults-file=${cwd}/regressmysql.cnf +./grant_bacula_privileges --defaults-file=${cwd}/regressmysql.cnf cd ${cwd} # Start and stop Bacula to ensure conf files are OK bin/bacula start diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test index 21ae454..33280fd 100755 --- a/regress/tests/accurate-test +++ b/regress/tests/accurate-test @@ -283,9 +283,9 @@ p Check with bscan stop_bacula cd $bin - ./drop_bacula_tables >/dev/null 2>&1 - ./make_bacula_tables >/dev/null 2>&1 - ./grant_bacula_privileges >/dev/null 2>&1 + ./drop_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 + ./make_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 + ./grant_bacula_privileges --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 cd .. echo "volume=TestVolume001" >tmp/bscan.bsr diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape index 7c68a78..ea4fb53 100755 --- a/regress/tests/bscan-fast-tape +++ b/regress/tests/bscan-fast-tape @@ -56,9 +56,9 @@ echo "End writing tape" # now drop and recreate the database # cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null +./drop_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 +./make_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 +./grant_bacula_privileges --defaults-file=${cwd}/regressmysql.cnf 2>&1 >/dev/null cd .. echo "Begin attempt to read tape that crashes the system" diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape index 419fd24..05127da 100755 --- a/regress/tests/bscan-tape +++ b/regress/tests/bscan-tape @@ -89,9 +89,9 @@ echo "Backup 4 done" # now drop and recreate the database # cd bin -./drop_bacula_tables >/dev/null 2>&1 -./make_bacula_tables >/dev/null 2>&1 -./grant_bacula_privileges 2>&1 >/dev/null +./drop_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 +./make_bacula_tables --defaults-file=${cwd}/regressmysql.cnf >/dev/null 2>&1 +./grant_bacula_privileges --defaults-file=${cwd}/regressmysql.cnf 2>&1 >/dev/null cd .. echo "volume=TestVolume001" >tmp/bscan.bsr