From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 5 Jun 2007 17:09:31 +0000 (+0000)
Subject: Move config.out into the functions file
X-Git-Tag: Release-7.0.0~6162
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd61c81550b1ed8dcaea21865a03bc5093483c06;p=bacula%2Fbacula

Move config.out into the functions file

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4983 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/scripts/functions b/regress/scripts/functions
index fa674c42e0..fcf773fb70 100644
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -160,3 +160,6 @@ if test "x${REGRESS_DEBUG}" = "x1"; then
 else
    set_debug 0
 fi
+
+# Source the second drive variables
+. ${cwd}/config.out
diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index 8e404e4722..79f711a6ba 100755
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -5,7 +5,6 @@
 #
 # This script uses the virtual disk autochanger and two drives
 #
-. config.out
 TestName="2drive-incremental-2disk"
 JobName="2drive2disk"
 . scripts/functions
diff --git a/regress/tests/2drive-incremental-2tape b/regress/tests/2drive-incremental-2tape
index fb54660959..013d033541 100755
--- a/regress/tests/2drive-incremental-2tape
+++ b/regress/tests/2drive-incremental-2tape
@@ -5,7 +5,6 @@
 #
 # This script uses the autochanger and two tapes
 #
-. config.out
 if test x${TAPE_DRIVE1} = x/dev/null ; then
    echo "Skipping 2drive-incremenatal-2tape test. No second drive."
    exit
diff --git a/regress/tests/fast-two-pool-test b/regress/tests/fast-two-pool-test
index b259efbbfb..7bc19e6b77 100755
--- a/regress/tests/fast-two-pool-test
+++ b/regress/tests/fast-two-pool-test
@@ -13,7 +13,6 @@ TestName="fast-two-pool-test"
 JobName=Fast-two-pool
 . scripts/functions
 
-. config.out
 scripts/cleanup
 scripts/copy-2disk-confs
 scripts/prepare-two-disks
diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index 438685411c..1064e7e198 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -9,7 +9,6 @@ TestName="incremental-2disk"
 JobName=Inc2disk
 . scripts/functions
 
-. config.out
 
 stop_bacula
 cd bin
diff --git a/regress/tests/incremental-2media b/regress/tests/incremental-2media
index c476b16819..c8624c1e17 100755
--- a/regress/tests/incremental-2media
+++ b/regress/tests/incremental-2media
@@ -10,7 +10,6 @@ TestName="incremental-2media"
 JobName=Inc2media
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-2disk-confs
diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 1ee97cd49c..5d94967d04 100755
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -5,7 +5,6 @@
 #
 # This script uses the autochanger and two tapes
 #
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "incremental-2tape test skipped. No autochanger."
    exit
diff --git a/regress/tests/migration-job-test b/regress/tests/migration-job-test
index d50d49748e..5600afb093 100755
--- a/regress/tests/migration-job-test
+++ b/regress/tests/migration-job-test
@@ -9,7 +9,6 @@ TestName="migration-job-test"
 JobName=MigrationJobSave
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
diff --git a/regress/tests/migration-jobspan-test b/regress/tests/migration-jobspan-test
index b81deac81b..1969e946a2 100755
--- a/regress/tests/migration-jobspan-test
+++ b/regress/tests/migration-jobspan-test
@@ -11,7 +11,6 @@ TestName="migration-jobspan-test"
 JobName=MigrationJobSpanSave
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
diff --git a/regress/tests/migration-occupancy-test b/regress/tests/migration-occupancy-test
index 80f81cd01e..9dc74a85f0 100755
--- a/regress/tests/migration-occupancy-test
+++ b/regress/tests/migration-occupancy-test
@@ -9,7 +9,6 @@ TestName="migration-occupancy-test"
 JobName=MigrationJobSave
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
diff --git a/regress/tests/migration-time-test b/regress/tests/migration-time-test
index c817d75ed8..3e744d4eb9 100755
--- a/regress/tests/migration-time-test
+++ b/regress/tests/migration-time-test
@@ -9,7 +9,6 @@ TestName="migration-time-test"
 JobName=MigrationJobSave
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
diff --git a/regress/tests/migration-volume-test b/regress/tests/migration-volume-test
index 0a75072156..55e6cf5952 100755
--- a/regress/tests/migration-volume-test
+++ b/regress/tests/migration-volume-test
@@ -9,7 +9,6 @@ TestName="migration-volume-test"
 JobName=MigVolBackup
 . scripts/functions
 
-. config.out
 
 scripts/cleanup
 scripts/copy-migration-confs
diff --git a/regress/tests/scratch-pool-test b/regress/tests/scratch-pool-test
index 29c319ee70..b63deca2c1 100755
--- a/regress/tests/scratch-pool-test
+++ b/regress/tests/scratch-pool-test
@@ -15,7 +15,6 @@ TestName="scratch-pool-test"
 JobName=scratch-pool
 . scripts/functions
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-volume-test skipped. No autochanger."
    exit
diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 11f040e59d..6a472a3625 100755
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -7,7 +7,6 @@
 #
 # This script uses the virtual disk autochanger and two drives
 #
-. config.out
 TestName="three-pool-disk"
 JobName="threepooldisk"
 . scripts/functions
diff --git a/regress/tests/two-pool-tape b/regress/tests/two-pool-tape
index f99709b067..179598d64b 100755
--- a/regress/tests/two-pool-tape
+++ b/regress/tests/two-pool-tape
@@ -11,7 +11,6 @@ TestName="two-pool-tape"
 JobName=twopooltape
 . scripts/functions
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-pool-tape test skipped. No autochanger."
    exit
diff --git a/regress/tests/two-pool-test b/regress/tests/two-pool-test
index 9705ea242e..fe1aae6d2a 100755
--- a/regress/tests/two-pool-test
+++ b/regress/tests/two-pool-test
@@ -13,7 +13,6 @@ TestName="two-pool-test"
 JobName=Two-pool
 . scripts/functions
 
-. config.out
 cwd=`pwd`
 scripts/cleanup
 scripts/copy-2disk-confs
diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index 4e5b547633..5c29974277 100755
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -9,7 +9,6 @@ TestName="two-volume-tape"
 JobName=twovoltape
 . scripts/functions
 
-. config.out
 if test x${AUTOCHANGER} = x/dev/null ; then
    echo "two-volume-tape test skipped. No autochanger."
    exit
diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 2ad887be90..c5ec0ecf1d 100755
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -10,7 +10,6 @@
 TestName="two-volume-test"
 JobName=TwoVolume
 . scripts/functions
-. config.out
 
 cwd=`pwd`
 scripts/cleanup