 -bin/disk-changer tmp/disk-changer/conf load 2 tmp/disk-changer/drive0 0
 +$scripts/disk-changer tmp/disk-changer/conf load 2 tmp/disk-changer/drive0 0
  echo "rtn=$?"   
-Index: tests/restore-disk-seek-test
-===================================================================
---- tests/restore-disk-seek-test	(révision 7895)
-+++ tests/restore-disk-seek-test	(copie de travail)
-@@ -42,8 +42,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%  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 CompressedTest $JobName
- start_test
 Index: tests/bug-fatal-test
 ===================================================================
 --- tests/bug-fatal-test	(révision 7895)
 +++ tests/bug-fatal-test	(copie de travail)
-@@ -10,9 +10,9 @@
- 
- copy_test_confs
- 
--rm -f bin/bacula-dir.conf
-+rm -f $bin/bacula-dir.conf
- rm -f ${cwd}/tmp/RUN*log
--/bin/cp -f scripts/bacula-dir.conf.testrunscript bin/bacula-dir.conf
-+cp -f scripts/bacula-dir.conf.testrunscript $bin/bacula-dir.conf
- 
- rm -f ${cwd}/tmp/file-list
- # ${cwd}/tmp/file-list doesn't exists
 @@ -34,12 +34,11 @@
  END_OF_DATA
  

+LD_LIBRARY_PATH=$bin
 export LD_LIBRARY_PATH
 
Index: scripts/copy-plugin-confs
===================================================================
--- scripts/copy-plugin-confs	(révision 7895)
+++ scripts/copy-plugin-confs	(copie de travail)
@@ -1,7 +1,7 @@
 #!/bin/sh
-/bin/cp -f scripts/plugin-test-bacula-dir.conf bin/bacula-dir.conf
-/bin/cp -f scripts/test-bacula-sd.conf bin/bacula-sd.conf
-/bin/cp -f scripts/test-bacula-fd.conf bin/bacula-fd.conf
-/bin/cp -f scripts/test-console.conf bin/bconsole.conf
+/bin/cp -f scripts/plugin-test-bacula-dir.conf $bin/bacula-dir.conf
+/bin/cp -f scripts/test-bacula-sd.conf $bin/bacula-sd.conf
+/bin/cp -f scripts/test-bacula-fd.conf $bin/bacula-fd.conf
+/bin/cp -f scripts/test-console.conf $bin/bconsole.conf
 
 scripts/set_tape_options
Index: tests/maxvol-test
===================================================================
--- tests/maxvol-test	(révision 7895)
+++ tests/maxvol-test	(copie de travail)
@@ -13,8 +13,8 @@
 scripts/copy-test-confs
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
-cp -f ${cwd}/bin/bacula-dir.conf ${cwd}/tmp/1
-sed "s%# Maximum Volume Jobs%  Maximum Volume Jobs%" ${cwd}/tmp/1 >${cwd}/bin/bacula-dir.conf
+cp -f $bin/bacula-dir.conf ${cwd}/tmp/1
+sed "s%# Maximum Volume Jobs%  Maximum Volume Jobs%" ${cwd}/tmp/1 >$bin/bacula-dir.conf
 
 
 change_jobname NightlySave $JobName
Index: tests/eot-fail-tape
===================================================================
--- tests/eot-fail-tape	(révision 7895)
+++ tests/eot-fail-tape	(copie de travail)
@@ -14,8 +14,8 @@
 
 out="${cwd}/tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${out}
-cp -f ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed -f ${out} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+cp -f $bin/bacula-sd.conf ${cwd}/tmp/1
+sed -f ${out} ${cwd}/tmp/1 >$bin/bacula-sd.conf
 
 change_jobname $JobName
 start_test
Index: tests/two-volume-test
===================================================================
--- tests/two-volume-test	(révision 7895)
+++ tests/two-volume-test	(copie de travail)
@@ -20,8 +20,8 @@
 
 outf="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${outf}
-cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
-sed -f ${outf} ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
+cp $bin/bacula-sd.conf ${cwd}/tmp/1
+sed -f ${outf} ${cwd}/tmp/1 >$bin/bacula-sd.conf
 
 change_jobname NightlySave $JobName
 start_test
Index: tests/ansi-label-tape
===================================================================
--- tests/ansi-label-tape	(révision 7895)
+++ tests/ansi-label-tape	(copie de travail)
@@ -15,7 +15,7 @@
 require_tape_drive
 
 scripts/copy-tape-confs
-/bin/cp -f scripts/ansi-sd-tape.conf bin/bacula-sd.conf
+cp -f scripts/ansi-sd-tape.conf $bin/bacula-sd.conf
 scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
Index: tests/2drive-2disk
===================================================================
--- tests/2drive-2disk	(révision 7895)
+++ tests/2drive-2disk	(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/btape-fill-full-tape
===================================================================
--- tests/btape-fill-full-tape	(révision 7895)

 scripts/copy-2disk-confs
 scripts/prepare-disk-changer
 
Index: tests/lib-tape-root
===================================================================
--- tests/lib-tape-root	(révision 7895)
