Update tests

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index b583255680a30e79099e059dfc322372a9d97671..6ddd0570c51e944878b1df5911c82ae80c74b7f8 100644 (file)
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -281,3 +281,4 @@ fi
 # Source the configuration variables
 . ${cwd}/config
 
+CLIENT=${HOST}-fd

diff --git a/regress/tests/2drive-2disk b/regress/tests/2drive-2disk
index 103768afde3b0af0fc7744d6926aaddc2c4a267d..d28258aa86fee51b2e72fa7e838554d7a7149381 100755 (executable)
--- a/regress/tests/2drive-2disk
+++ b/regress/tests/2drive-2disk
@@ -33,7 +33,7 @@ messages
 @$out ${cwd}/tmp/log1.out
 setdebug level=3 dir
 setdebug level=3 storage=DDS-4
-setdebug level=3 client
+setdebug level=3 client=$CLIENT
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=1
 # label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=DDS-4

diff --git a/regress/tests/2drive-incremental-2disk b/regress/tests/2drive-incremental-2disk
index da1e6016a233530130bbd7fb49a797ba71b81141..684965c2c5aba961d5ff5ac72ef29b942abcbf30 100755 (executable)
--- a/regress/tests/2drive-incremental-2disk
+++ b/regress/tests/2drive-incremental-2disk
@@ -41,7 +41,7 @@ messages
 @$out ${cwd}/tmp/log1.out
 setdebug level=3 dir
 setdebug level=3 storage=DDS-4
-setdebug level=3 client
+setdebug level=3 client=2drive2disk 
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Default drive=1
 status storage=DDS-4

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index cfa545590e1bac097efe0cb030fe45d291197b1e..a94449149fee979aad9ca00eeb8d6203d11385dd 100755 (executable)
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -364,7 +364,7 @@ rm -rf ${cwd}/tmp/bacula-restores
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
-setdebug  level=1 client
+setdebug  level=1 client=$CLIENT
 run job=backup fileset=FS_TESTJOB2 yes
 wait
 messages
@@ -405,4 +405,3 @@ fi
 
 stop_bacula
 end_test
-

diff --git a/regress/tests/bug-897 b/regress/tests/bug-897
index 67d0c2f2bb8143c0abb65a31910bef32f525cf43..4b9de5438b46ed09f752099320f8315759e37970 100755 (executable)
--- a/regress/tests/bug-897
+++ b/regress/tests/bug-897
@@ -39,7 +39,7 @@ wait
 messages
 @sleep 1
 @$out ${cwd}/tmp/RUN_BUG_897.log
-setdebug level=200 client
+setdebug level=200 client=$CLIENT
 run job=BUG_897 yes
 @sleep 2
 cancel

diff --git a/regress/tests/fifo-test b/regress/tests/fifo-test
index e994caeafc553d2af41921cbe3ccb323f785193d..c0dcd4232fada43e36827570ce5e7733289954c3 100755 (executable)
--- a/regress/tests/fifo-test
+++ b/regress/tests/fifo-test
@@ -39,7 +39,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-@#setdebug level=50 client
+@#setdebug level=50 client=$CLIENT
 restore where=/  select all storage=File1 done
 yes
 wait

diff --git a/regress/tests/strip-test b/regress/tests/strip-test
index 68a3d689319b20bc2306d26dc819ed3518055417..6b86ce4ac90edba4187a36512ee82724c4ef717b 100755 (executable)
--- a/regress/tests/strip-test
+++ b/regress/tests/strip-test
@@ -21,7 +21,7 @@ messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=150 dir
 @#setdebug level=150 storage=FileStorage
-setdebug level=100 client
+setdebug level=100 client=$CLIENT
 label storage=FileStorage pool=Default volume=TestVolume001
 run job=$JobName storage=FileStorage pool=Default yes
 wait
@@ -39,7 +39,7 @@ messages
 @# now do a restore
 @#
 @$out ${cwd}/tmp/log2.out
-@#setdebug level=50 client
+@#setdebug level=50 client=$CLIENT
 restore where=${cwd}/tmp/bacula-restores select all storage=FileStorage done
 yes
 wait

diff --git a/regress/tests/three-pool-test b/regress/tests/three-pool-test
index 92ff97f6564de2d380b49aa260e705c655f78a3c..2f72ee42b9f0aed7e2a2734cf963992c4af6bde0 100755 (executable)
--- a/regress/tests/three-pool-test
+++ b/regress/tests/three-pool-test
@@ -33,7 +33,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=200 storage=DDS-4
-@#setdebug level=200 client 
+@#setdebug level=200 client=$CLIENT 
 label storage=DDS-4 volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=DDS-4 volume=TestVolume002 slot=2 Pool=Full    drive=0
 label storage=DDS-4 volume=TestVolume003 slot=3 Pool=Inc     drive=1

diff --git a/regress/tests/tls-authenticate-test b/regress/tests/tls-authenticate-test
index 38dffafc6d575dbb543cd4b922290372f81bb421..10fadd2be6591bc0046e141fe01d08a04bf2938c 100755 (executable)
--- a/regress/tests/tls-authenticate-test
+++ b/regress/tests/tls-authenticate-test
@@ -20,7 +20,7 @@ messages
 @$out tmp/log1.out
 setdebug level=100 dir
 setdebug level=100 storage=File
-setdebug level=100 client
+setdebug level=100 client=$CLIENT
 status all
 status all
 messages

diff --git a/regress/tests/two-volume-changer b/regress/tests/two-volume-changer
index e06cf230655b1eabe7c0c749c46dbc3b05738a59..e9e48d27600c54fe52ef8c5927baff6cb0079564 100755 (executable)
--- a/regress/tests/two-volume-changer
+++ b/regress/tests/two-volume-changer
@@ -38,7 +38,7 @@ sql
 select * from Storage;
 select VolumeName,InChanger,Slot,StorageId from Media;
 
-@#setdebug level=1000 client 
+@#setdebug level=1000 client=$CLIENT 
 @#setdebug level=250 storage=DDS-4
 run job=$JobName yes
 wait

diff --git a/regress/tests/two-volume-test b/regress/tests/two-volume-test
index 1266e75d76c84605555cf775d4c28a6cd2e35751..920beb57ac68bab9d52e7454411266f848d9ab7b 100755 (executable)
--- a/regress/tests/two-volume-test
+++ b/regress/tests/two-volume-test
@@ -38,7 +38,7 @@ sql
 select * from Storage;
 select VolumeName,InChanger,StorageId from Media;
 
-@#setdebug level=1000 client 
+@#setdebug level=1000 client=$CLIENT 
 run job=$JobName yes
 wait
 update slots scan storage=DDS-4

diff --git a/regress/tests/virtual-changer-test b/regress/tests/virtual-changer-test
index 33178f57ef3203ee4a84daaf0ba9866ed2b46dea..134447ebfad6d01bc039ee707bb53292f2cc6d90 100755 (executable)
--- a/regress/tests/virtual-changer-test
+++ b/regress/tests/virtual-changer-test
@@ -33,7 +33,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 messages
 @$out ${cwd}/tmp/log1.out
 @#setdebug level=200 storage=Virtual
-@#setdebug level=200 client 
+@#setdebug level=200 client=$CLIENT 
 label storage=Virtual volume=TestVolume001 slot=1 Pool=Default drive=0
 label storage=Virtual volume=TestVolume002 slot=2 Pool=Full    drive=0
 label storage=Virtual volume=TestVolume003 slot=3 Pool=Inc     drive=1