Updates

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

diff --git a/regress/all-non-root-tape-tests b/regress/all-non-root-tape-tests
index 708aa8389de23f4444e1daf5c1e5ede34ee937dc..a924931708aaca8b5182bf0c744de7aa6e21e305 100755 (executable)
--- a/regress/all-non-root-tape-tests
+++ b/regress/all-non-root-tape-tests
@@ -2,7 +2,7 @@
 #
 # Run all tape tests
 #
-. ./config.out
+. ./config
 if test ! x$AUTOCHANGER = x/dev/null ; then
    mtx -f $AUTOCHANGER load 1 >/dev/null &2>/dev/null
 fi
@@ -10,20 +10,19 @@ echo " "
 echo " " >>test.out
 echo "Start all non-root tape tests"
 echo "Start all non-root tape tests" >>test.out
-nice tests/ansi-label-tape
-nice tests/backup-bacula-tape
-nice tests/btape-fill-tape
-nice tests/fixed-block-size-tape
-nice tests/four-concurrent-jobs-tape
-nice tests/four-jobs-tape
-nice tests/incremental-tape
-nice tests/relabel-tape
-nice tests/restore-by-file-tape
-nice tests/small-file-size-tape
-nice tests/truncate-bug-tape
-nice tests/two-pool-tape
-nice tests/2drive-incremental-2tape
-nice tests/bscan-tape
-nice tests/verify-vol-tape
+nice tests/ansi-label-1t1d-tape
+nice tests/backup-bacula-1t1d-tape
+nice tests/bscan-1t1d-tape
+nice tests/fixed-block-size-1t1d-tape
+nice tests/four-concurrent-jobs-1t1d-tape
+nice tests/four-jobs-1t1d-tape
+nice tests/incremental-1t1d-tape
+nice tests/relabel-1t1d-tape
+nice tests/restore-by-file-1t1d-tape
+nice tests/small-file-size-1t1d-tape
+nice tests/truncate-bug-1t1d-tape
+nice tests/two-pool-2t1da-tape
+nice tests/verify-vol-1t1d-tape
+nice tests/vol-duration-2t1da-test
 echo "End all non-root tape tests"
 echo "End all non-root tape tests" >>test.out

diff --git a/regress/tests/auto-label-test b/regress/tests/auto-label-test
index e709b600ec86cde86357dc88b2ef3b4e1fa0db4e..b77ee6423cfcf14dcb4de566c120660165518749 100755 (executable)
--- a/regress/tests/auto-label-test
+++ b/regress/tests/auto-label-test
@@ -30,6 +30,12 @@ run job=$JobName storage=File yes
 list pools
 list volumes
 wait
+sql
+SELECT StartTime, JobFiles, JobId, Level, count(*) AS nb_jobmedia  
+FROM JobMedia join Job using (JobId) join Client using (ClientId) 
+where Client.Name = 'localhost-fd' group by JobId, Level, StartTime, 
+JobFiles order by JobId desc ;
+
 messages
 @# 
 @# now do a restore