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 fa674c42e04dcc0769394ba97c7e08b72e2d77d4..fcf773fb70db51b752d92649d2851445171ac51c 100644 (file)
--- 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 8e404e4722fd0e4d2e3872088361f4217b7ce647..79f711a6ba722ad13449bca0bfefeaa149eafb16 100755 (executable)
--- 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 fb5466095920ae8f48a502d2a014c80d2739e6b6..013d033541d460dac83603d20621b813b4fbba25 100755 (executable)
--- 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 b259efbbfbe624bc8a941452a3d71aa4d6cd8389..7bc19e6b77592050afcc0707d0cb428b3aa5c4a1 100755 (executable)
--- 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 438685411c503b53a53a5508c2ab2468c4fa752b..1064e7e19867982404de92bfcf50db860d1af594 100755 (executable)
--- 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 c476b16819f03d4ba56dbe18099b1444bdf66dd7..c8624c1e173c6f7531756bb700d6131763f0d09b 100755 (executable)
--- 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 1ee97cd49c302f5c74d41557e22018a3a4c4ef0c..5d94967d040fe8930bd27bd76efbf839de1a50b5 100755 (executable)
--- 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 d50d49748e096046e3b16c10222590cba664261c..5600afb093ea30f8661ef5ea5c8efbc9f12f5b28 100755 (executable)
--- 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 b81deac81b85a4a0fe2ef9370e3d3b8847ec3acd..1969e946a2d586234d01254910781af42cbf6598 100755 (executable)
--- 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 80f81cd01ed74f1f354c59695d030f363cf77751..9dc74a85f03309567ccc6ada0634b1fc6938f7f4 100755 (executable)
--- 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 c817d75ed88775efcd68f80e38e674f464e7d886..3e744d4eb92d873d1909664a11de50798ef88452 100755 (executable)
--- 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 0a75072156a1ba8f1279c27fdba3f71ca781ad84..55e6cf59529fd23f4184310956b67eaf7e844d91 100755 (executable)
--- 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 29c319ee703dcb0fac0d66c6f37b9bc995f61a17..b63deca2c1752e28ff84bf3b0e1eb0642245ede8 100755 (executable)
--- 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 11f040e59d4dd03a381fdd35bd5df58ed9b81eb6..6a472a3625e656b28dbe8607639635072fbc054e 100755 (executable)
--- 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 f99709b0675252e4e85ba783c96b8de12b87260a..179598d64bbc2ff855ff5ddad5124817cf8d14bd 100755 (executable)
--- 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 9705ea242eab8021a6ea45d9caa00fbeb36955bb..fe1aae6d2a8803aedcb7e34035036c9a67e7cffc 100755 (executable)
--- 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 4e5b547633223ea6b04be46a53ac2bd6ffa134d0..5c29974277b83bf69d3629fc0febdeff0264d47d 100755 (executable)
--- 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 2ad887be90df039e4507fc4e6095f20ee6d37f95..c5ec0ecf1dcbedd1828d121ee24282e35e4ca858 100755 (executable)
--- 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