  cd /
  ${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original
  cd ${cwd}/tmp/bacula-restores
-Index: tests/multi-client-test
-===================================================================
---- tests/multi-client-test	(révision 7895)
-+++ tests/multi-client-test	(copie de travail)
-@@ -11,7 +11,7 @@
- 
- scripts/cleanup
- scripts/copy-test-confs
--/bin/cp -f scripts/multi-client-bacula-dir.conf bin/bacula-dir.conf
-+cp -f scripts/multi-client-bacula-dir.conf $bin/bacula-dir.conf
- 
- change_jobname NightlySave $JobName
- start_test
-Index: tests/small-file-size-tape
-===================================================================
---- tests/small-file-size-tape	(révision 7895)
-+++ tests/small-file-size-tape	(copie de travail)
-@@ -13,8 +13,8 @@
- scripts/cleanup-tape
- 
- echo "${cwd}/build" >${cwd}/tmp/file-list
--cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
--sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
-+cp $bin/bacula-sd.conf ${cwd}/tmp/1
-+sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >$bin/bacula-sd.conf
- 
- change_jobname NightlySave $JobName
- start_test
-Index: tests/2drive-offline-test
-===================================================================
---- tests/2drive-offline-test	(révision 7895)
-+++ tests/2drive-offline-test	(copie de travail)
-@@ -25,10 +25,10 @@
- # Turn off Prefer Mounted Volumes so we use 2 drives
- outf="${cwd}/tmp/sed_tmp"
- echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
--cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
-+cp $bin/bacula-dir.conf ${cwd}/tmp/1
- # Comment the next line out to write everything to one drive
- #  otherwise, it writes the two jobs to different drives
--sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
-+sed -f ${outf} ${cwd}/tmp/1 >$bin/bacula-dir.conf
- 
- # Write out bconsole commands
- cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 Index: tests/concurrent-jobs-test
 ===================================================================
 --- tests/concurrent-jobs-test	(révision 7895)

 check_for_zombie_jobs storage=File $client
 stop_bacula
 
Index: tests/three-pool-test
===================================================================
--- tests/three-pool-test	(révision 7895)
+++ tests/three-pool-test	(copie de travail)
@@ -23,10 +23,10 @@
 # Turn off Prefer Mounted Volumes so we use 2 drives
 outf="${cwd}/tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
-cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+cp $bin/bacula-dir.conf ${cwd}/tmp/1
 # Comment the next line out to write everything to one drive
 #  otherwise, it writes the two jobs to different drives
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+sed -f ${outf} ${cwd}/tmp/1 >$bin/bacula-dir.conf
 
 # Write out bconsole commands
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
Index: tests/copy-job-test
===================================================================
--- tests/copy-job-test	(révision 7895)
+++ tests/copy-job-test	(copie de travail)
@@ -14,8 +14,8 @@
 scripts/copy-migration-confs
 scripts/prepare-disk-changer
 echo "${cwd}/build" >${cwd}/tmp/file-list
-sed 's/migrate/copy/g' ${cwd}/bin/bacula-dir.conf > ${cwd}/tmp/1
-sed 's/Migrate/Copy/g' ${cwd}/tmp/1 > ${cwd}/bin/bacula-dir.conf
+sed 's/migrate/copy/g' $bin/bacula-dir.conf > ${cwd}/tmp/1
+sed 's/Migrate/Copy/g' ${cwd}/tmp/1 > $bin/bacula-dir.conf
 
 
 change_jobname NightlySave $JobName
Index: tests/restore-seek-tape
===================================================================
--- tests/restore-seek-tape	(révision 7895)
+++ tests/restore-seek-tape	(copie de travail)
@@ -45,8 +45,8 @@
 # Enable MaximumFileSize to ensure lots of JobMedia records and thus
 #  lots of seeking
 #
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed "s%# Maximum File Size = 1000000%  Maximum File Size = 10KB%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+cp $bin/bacula-sd.conf ${cwd}/tmp/1
+sed "s%# Maximum File Size = 1000000%  Maximum File Size = 10KB%" ${cwd}/tmp/1 >$bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
 start_test
Index: tests/2drive-incremental-changer
===================================================================
--- tests/2drive-incremental-changer	(révision 7895)
+++ tests/2drive-incremental-changer	(copie de travail)
@@ -31,10 +31,10 @@
 # Turn off Prefer Mounted Volumes so we use 2 drives
 outf="${cwd}/tmp/sed_tmp"
 echo "s%# Prefer Mounted Volumes%  Prefer Mounted Volumes%g" >${outf}
-cp ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
+cp $bin/bacula-dir.conf ${cwd}/tmp/1
 # Comment the next line out to write everything to one drive
 #  otherwise, it writes the two jobs to different drives
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+sed -f ${outf} ${cwd}/tmp/1 >$bin/bacula-dir.conf
 
 start_test
 
Index: tests/restore-by-file-tape
===================================================================
--- tests/restore-by-file-tape	(révision 7895)
+++ tests/restore-by-file-tape	(copie de travail)
@@ -18,8 +18,8 @@
 echo "${cwd}/build" >${cwd}/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list
 
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+cp $bin/bacula-sd.conf ${cwd}/tmp/1
+sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >$bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
 start_test
@@ -93,7 +93,7 @@
 check_two_logs
 

 
 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/bacula-sd.conf ${cwd}/tmp                   
+  $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp                   
 else
-  bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >tmp/log3.out
+  $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp >tmp/log3.out 2>&1
 fi
 
 cat <<END_OF_DATA >tmp/bconcmds
Index: tests/bscan-fast-tape
===================================================================
--- tests/bscan-fast-tape	(révision 7895)
+++ tests/bscan-fast-tape	(copie de travail)
@@ -34,7 +34,7 @@
 END_OF_DATA
 
 echo "Starting Bacula tape writing"
-#bin/btape -c bin/bacula-sd.conf /dev/nst0 <<END_OF_DATA
+#$bin/btape -c bin/bacula-sd.conf /dev/nst0 <<END_OF_DATA
 #rewind
 #label
 #Test001
