regress: Tweak regress for external test

diff --git a/regress/scripts/copy-test-confs b/regress/scripts/copy-test-confs
index 7c0ccd9d988e1520286cc0a9053b825c6a6dd017..32067113dfcc51dca422419c0da2b3d9ef67c39c 100755 (executable)
--- a/regress/scripts/copy-test-confs
+++ b/regress/scripts/copy-test-confs
@@ -1,7 +1,7 @@
 #!/bin/sh
-/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${bin}/bacula-dir.conf
-/bin/cp -f ${rscripts}/test-bacula-sd.conf ${bin}/bacula-sd.conf
-/bin/cp -f ${rscripts}/test-bacula-fd.conf ${bin}/bacula-fd.conf
-/bin/cp -f ${rscripts}/test-console.conf ${bin}/bconsole.conf
+/bin/cp -f ${rscripts}/new-test-bacula-dir.conf ${conf}/bacula-dir.conf
+/bin/cp -f ${rscripts}/test-bacula-sd.conf ${conf}/bacula-sd.conf
+/bin/cp -f ${rscripts}/test-bacula-fd.conf ${conf}/bacula-fd.conf
+/bin/cp -f ${rscripts}/test-console.conf ${conf}/bconsole.conf
 
 ${rscripts}/set_tape_options

diff --git a/regress/scripts/functions b/regress/scripts/functions
index 5c3ed5b55af7620d20ca56459ede1f15ad913e8a..f0baea1214ccb41cba0f313898e6675fd9b32a54 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -172,7 +172,7 @@ run_bacula()
      cat ${tmp}/bconcmds | ${bin}/bconsole -c ${conf}/bconsole.conf
      return $?
    else
-     ${bin}/bacula start >/dev/null 2>&1
+     ${scripts}/bacula start >/dev/null 2>&1
      cat ${tmp}/bconcmds | ${bin}/bconsole -c ${conf}/bconsole.conf >/dev/null 2>&1
      return $?
    fi
@@ -225,9 +225,9 @@ bscan_libdbi()
 stop_bacula()
 {
    if test "$debug" -eq 1 ; then
-      ${bin}/bacula stop
+      ${scripts}/bacula stop
    else
-      ${bin}/bacula stop 2>&1 >/dev/null
+      ${scripts}/bacula stop 2>&1 >/dev/null
    fi
 }
 
@@ -508,10 +508,10 @@ dumps=${dumps:-"$cwd/dumps"}
 bin=${bin:-"$cwd/bin"}
 
 # Bacula scripts
-scripts=${scripts:-"$bin"}
+scripts=${scripts:-"$cwd/bin"}
 
 # Bacula conf files
-conf=${conf:-"$bin"}
+conf=${conf:-"$cwd/bin"}
 
 # Regress scripts
 rscripts=${rscripts:-"$cwd/scripts"}

diff --git a/regress/scripts/set_tape_options b/regress/scripts/set_tape_options
index 56afa4f35b2273536411c5577e1c091d74f6f221..3681aceccf9be2812a6d260d9ca8b66c93d32c95 100755 (executable)
--- a/regress/scripts/set_tape_options
+++ b/regress/scripts/set_tape_options
@@ -1,10 +1,10 @@
 #!/bin/sh 
 . scripts/functions
 # get proper SD tape definitions
-cp -f ${rscripts}/linux_tape_options ${bin}/tape_options
+cp -f ${rscripts}/linux_tape_options ${conf}/tape_options
 if test x`uname` = xFreeBSD ; then
-   cp -f ${rscripts}/freebsd_tape_options ${bin}/tape_options
+   cp -f ${rscripts}/freebsd_tape_options ${conf}/tape_options
 fi
 if test x${USE_VTAPE} = xyes ; then
-  echo "  Device Type = vtape" >>${bin}/tape_options
+  echo "  Device Type = vtape" >>${conf}/tape_options
 fi