Tweak get_os

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

diff --git a/regress/scripts/get-os b/regress/scripts/get-os
index 64cb63cc1b5c7ffd3ce2191d8540243de5433636..7b3d1aa644c1a81e6fa9e8bd207d2f74ff547f70 100755 (executable)
--- a/regress/scripts/get-os
+++ b/regress/scripts/get-os
@@ -434,6 +434,15 @@ debian)
         else
            DISTVER=`cat /etc/debian_version`
         fi
+        if test -f /etc/lsb-release ; then
+           . /etc/lsb-release
+           if test "x$DISTRIB_ID" != "x" ; then
+              DISTNAME=$DISTRIB_ID
+           fi
+           if test "x$DISTRIB_RELEASE" != "x" ; then
+              DISTVER=$DISTRIB_RELEASE
+           fi
+        fi
   ;;
 freebsd)
         DISTVER=`uname -a |awk '{print $3}'`

diff --git a/regress/tests/incremental-1t1d-tape b/regress/tests/incremental-1t1d-tape
index f1616283125165fa8c506dffa54cb6c17da0f077..75dc046a9dcd44ef9c76e4570381e90713ff66ba 100755 (executable)
--- a/regress/tests/incremental-1t1d-tape
+++ b/regress/tests/incremental-1t1d-tape
@@ -7,7 +7,8 @@ TestName="incremental-1t1d-tape"
 JobName=IncTape
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 if test ! -d ${cwd}/tmp/build ; then

diff --git a/regress/tests/relabel-1t1d-tape b/regress/tests/relabel-1t1d-tape
index 69a36f61ab95b2d38bb0dc7eeaa180e8698ef84e..a4bca3f26a5124f309fb2f01fc29a764d2b0979b 100755 (executable)
--- a/regress/tests/relabel-1t1d-tape
+++ b/regress/tests/relabel-1t1d-tape
@@ -10,6 +10,7 @@ JobName=Relabeltape
 
 scripts/cleanup-tape
 scripts/copy-tape-confs
+
 echo "${cwd}/build" >${cwd}/tmp/file-list
 
 change_jobname $JobName

diff --git a/regress/tests/restore-by-file-1t1d-tape b/regress/tests/restore-by-file-1t1d-tape
index 8ac4118cf17599fccbda1bf41238bbd452375d48..7dea206fe0c1ac0a163a7ef6edf3e315f58e611a 100755 (executable)
--- a/regress/tests/restore-by-file-1t1d-tape
+++ b/regress/tests/restore-by-file-1t1d-tape
@@ -9,7 +9,8 @@
 TestName="restore-by-file-1t1d-tape"
 JobName=restorebyfile
 . scripts/functions
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist | sort | uniq >${cwd}/tmp/restore2-list

diff --git a/regress/tests/restore-seek-tape b/regress/tests/restore-seek-tape
index aa394beb60ba357676e2f3031503b52f83624d61..7d5b17b0d2bd7e31dd09ed0ebf8a8deff10d6c77 100755 (executable)
--- a/regress/tests/restore-seek-tape
+++ b/regress/tests/restore-seek-tape
@@ -10,7 +10,9 @@ TestName="restore-seek-tape"
 JobName=restore-tape-seek
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
+
 echo "${cwd}/tmp/build" >${cwd}/tmp/file-list
 rm -rf ${cwd}/tmp/build
 mkdir ${cwd}/tmp/build

diff --git a/regress/tests/small-file-size-1t1d-tape b/regress/tests/small-file-size-1t1d-tape
index 49dbe2130e8e79b730fcc5cdd183d3646b14b974..658832339afde255227ffa6340c965037a85e851 100755 (executable)
--- a/regress/tests/small-file-size-1t1d-tape
+++ b/regress/tests/small-file-size-1t1d-tape
@@ -7,7 +7,8 @@ TestName="small-file-size-1t1d-tape"
 JobName=smallfilesize
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1

diff --git a/regress/tests/truncate-bug-1t1d-tape b/regress/tests/truncate-bug-1t1d-tape
index 8be197d8599dc4fe7e34693bd5a145be23709547..ac28b281e1474c37a43cb9d45ef0ff5ae82fe508 100755 (executable)
--- a/regress/tests/truncate-bug-1t1d-tape
+++ b/regress/tests/truncate-bug-1t1d-tape
@@ -6,7 +6,8 @@ TestName="truncate-bug-1t1d-tape"
 JobName=truncatebug
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list
 

diff --git a/regress/tests/verify-vol-1t1d-tape b/regress/tests/verify-vol-1t1d-tape
index 914422f71b22bb19c4e562fed1f1ad3f267badf6..1670ed18798a01322ec43e3eb6561323a54cc51e 100755 (executable)
--- a/regress/tests/verify-vol-1t1d-tape
+++ b/regress/tests/verify-vol-1t1d-tape
@@ -7,7 +7,8 @@ TestName="verify-vol-1t1d-tape"
 JobName=VerifyVol
 . scripts/functions
 
-copy_tape_confs
+scripts/copy-tape-confs
+scripts/cleanup-tape
 
 echo "${cwd}/build" >${cwd}/tmp/file-list