Skip to content
This repository has been archived by the owner on Mar 19, 2021. It is now read-only.

Commit

Permalink
don't specify config file
Browse files Browse the repository at this point in the history
as behavior to find the config file have changed, when config file is
relative and contains a "/".
Now, reletive config file are always treated relative to the build time
configured config directory.
  • Loading branch information
joergsteffens committed May 11, 2016
1 parent 7bc356f commit 5634af7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/bextract-test
Expand Up @@ -44,9 +44,9 @@ stop_bareos

mkdir -p ${cwd}/tmp/bareos-restores
if test "$debug" -eq 1 ; then
$bin/bextract -v -b working/restore.bsr -c bin/bareos-sd.conf ${cwd}/tmp ${cwd}/tmp/bareos-restores
$bin/bextract -v -b working/restore.bsr ${cwd}/tmp ${cwd}/tmp/bareos-restores
else
$bin/bextract -b working/restore.bsr -c bin/bareos-sd.conf ${cwd}/tmp ${cwd}/tmp/bareos-restores 2>&1 >/dev/null
$bin/bextract -b working/restore.bsr ${cwd}/tmp ${cwd}/tmp/bareos-restores 2>&1 >/dev/null
fi
rstat=$?
grep "^ Termination: *Backup OK" ${cwd}/tmp/log1.out 2>&1 >/dev/null
Expand Down
4 changes: 2 additions & 2 deletions tests/bscan-test
Expand Up @@ -67,9 +67,9 @@ else
fi

if test "$debug" -eq 1 ; then
$bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bareos-sd.conf ${cwd}/tmp
$bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr ${cwd}/tmp
else
$bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bareos-sd.conf ${cwd}/tmp >tmp/log3.out 2>&1
$bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr ${cwd}/tmp >tmp/log3.out 2>&1
fi

cat <<END_OF_DATA >tmp/bconcmds
Expand Down

0 comments on commit 5634af7

Please sign in to comment.