X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Fbase-job-test;h=2104b1095d6293e5c2ce51819eb6396348d77d85;hb=3ed2a50fa32feba5307766909a2d8ff82385f131;hp=37ea770451c8b9d2ef6634e59f1cf50127c94726;hpb=7f238bc3d7daa64eefea1293ad1b864e9e304c22;p=bacula%2Fbacula

diff --git a/regress/tests/base-job-test b/regress/tests/base-job-test
index 37ea770451..2104b1095d 100755
--- a/regress/tests/base-job-test
+++ b/regress/tests/base-job-test
@@ -10,8 +10,11 @@ JobName=backup
 $rscripts/cleanup
 
 copy_test_confs
-sed 's/backup_advance/base_backup/' $rscripts/bacula-dir.conf.accurate > $tmp/1
-sed 's/Name = backup/Name = backup; Base = base_backup, backup/' $tmp/1 > $conf/bacula-dir.conf
+echo 's/backup_advance/base_backup/' > $tmp/s
+echo 's/Name = backup/Name = backup; Base = base_backup, backup/' >> $tmp/s
+sed -f $tmp/s $rscripts/bacula-dir.conf.accurate > $conf/bacula-dir.conf
+rm -f $tmp/s
+
 sed s/all,/all,saved,/ $conf/bacula-fd.conf > tmp/1
 cp tmp/1 $conf/bacula-fd.conf
 
@@ -100,7 +103,13 @@ rm -rf ${cwd}/tmp/bacula-restores
 
 grep -e 'FD Bytes Written: *0' ${cwd}/tmp/log4.out > /dev/null
 if [ $? -ne 0 ]; then
-    print_debug "The first full job should have 0 byte in log4.out"
+    print_debug "ERROR: The first full job should have 0 byte in log4.out"
+    bstat=2
+fi
+
+grep -e 'Using BaseJobId(s): 1$'  ${cwd}/tmp/log4.out > /dev/null
+if [ $? -ne 0 ]; then
+    print_debug "ERROR: The first full job should use only jobid=1 as basejob"
     bstat=2
 fi
 
@@ -114,6 +123,7 @@ label volume=TestVolume003 storage=File pool=Default
 run job=backup level=incremental yes
 wait
 messages
+list files jobid=4
 @# 
 @# now do a restore
 @#
@@ -156,8 +166,8 @@ run_bconsole
 
 grep -e ' 0 *|' ${cwd}/tmp/log3.out > /dev/null
 if [ $? -ne 0 ]; then
-    print_debug "Can't purge the base job"
-    dstat=2
+    print_debug "ERROR: Can't purge the base job"
+    estat=1
 fi
 
 
@@ -171,22 +181,22 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 run level=full job=backup yes
 wait
 messages
-@$out ${cwd}/tmp/log5.out
+@out ${cwd}/tmp/log5.out
 list basefiles jobid=6
-@$out ${cwd}/tmp/log6.out
+@out ${cwd}/tmp/log6.out
 list files jobid=6
 messages
 END_OF_DATA
 
 run_bconsole
 
-grep po/fr.po ${cwd}/tmp/log5.out > /dev/null
+grep "po/fr.po^" ${cwd}/tmp/log5.out > /dev/null
 if [ $? -eq 0 ]; then
-    print_debug "Should not display fr.po as basefile"
-    bstat=2
+    print_debug "ERROR: Should not display fr.po as basefile"
+    estat=2
 fi
 
-export bstat dstat
+export bstat dstat estat
 
 stop_bacula
 end_test