New working dir

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

diff --git a/regress/.cvsignore b/regress/.cvsignore
index 5a3bc0f94e57ce07383a465a3d85be6043c010b4..6f0d68f2eef5733c1db51da2bac35d18869b319f 100644 (file)
--- a/regress/.cvsignore
+++ b/regress/.cvsignore
@@ -4,3 +4,4 @@ test.out
 wierd-files
 diff
 tmp
+working

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
new file mode 100755 (executable)
index 0000000..7c8004e
--- /dev/null
+++ b/regress/scripts/cleanup
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# Cleanup left over files -- both before and after test run
+#
+rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+rm -rf tmp/original tmp/bacula-restores tmp/SmallVols* tmp/TestVolume*
+rm -rf tmp/restored tmp/largefile

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 69bd330c09f2e7ae85bc5d016e9f3ff0ac86db55..03646b4905d676b4e2ed025befc206fbe624c2be 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -4,7 +4,7 @@ cwd=`pwd`
 # Create sed command script
 echo "s%@sbindir@%${cwd}/bin%g" >${out}
 echo "s%@scriptdir@%${cwd}/bin%g" >>${out}
-echo "s%@working_dir@%${cwd}/bin/working%g" >>${out}
+echo "s%@working_dir@%${cwd}/working%g" >>${out}
 echo "s%@piddir@%${cwd}/bin/working%g" >>${out}
 echo "s%@subsysdir@%${cwd}/bin/working%g" >>${out}
 echo "s%@job_email@%${1}%g" >>${out}

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index 1d4737c1fc92e32f5ccef611511e9ae91d8c8fce..0241deb53222d50e964334c7f2943290767b2e41 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -7,11 +7,11 @@ CFLAGS="-g -O2 -Wall" \
  ./configure \
     --sbindir=$1/bin \
     --sysconfdir=$1/bin \
-    --with-pid-dir=$1/bin/working \
-    --with-subsys-dir=$1/bin/working \
+    --with-pid-dir=$1/working \
+    --with-subsys-dir=$1/working \
     --enable-smartalloc \
     --with-sqlite=$2 \
-    --with-working-dir=$1/bin/working \
+    --with-working-dir=$1/working \
     --with-dump-email=$3 \
     --with-job-email=$3 \
     --with-baseport=8101 

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index a8039eebd0384b7110eb8cc023a623cae73103b6..3e81db61a082940abb9d9b97eeb89f7360a894ef 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
@@ -13,6 +13,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting Backup Bacula Test ==="
+echo " === Starting Backup Bacula Test ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -51,5 +52,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== Backup Bacula Test OK ===== "
    echo "  ===== Backup Bacula Test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 82ff4f54a09dab691d8d0c2546ce591a03320278..bc37c03f7abda184abd1305213401544bc54f061 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop  2>&1 >/dev/null
 bin/drop_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting compressed-test ==="
+echo " === Starting compressed-test ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -50,5 +51,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== compressed-test Bacula source OK ===== "
    echo "  ===== compressed-test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 1c369e0c254bf9e58c47feaf08a342c14ed51816..2048f7507e74e36e7558b6d0521b1fb780b747b5 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-testa-confs
-rm -rf tmp/SmallVols* tmp/bacula-restores tmp/largefile
+scripts/cleanup
 echo "${cwd}/tmp/largefile" >/tmp/file-list
 # Create 56MB file with random data
 echo "Creating a 56MB file with random data ..."
@@ -18,6 +18,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting two-vol-test  ==="
+echo " === Starting two-vol-test  ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -50,5 +51,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== six-vol-test Bacula source OK ===== "
    echo "  ===== six-vol-test OK ===== " >>test.out
-   rm -rf tmp/bacula-restores tmp/SmallVols* tmp/largefile
+   scripts/cleanup
 fi

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index d6e826300b84a9e11ea0cb9bc538104543f6a20c..4087b6181ff7eb487ac0db15eea15792f5c810ba 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting sparse-compressed-test ==="
+echo " === Starting sparse-compressed-test ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -51,5 +52,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== sparse-compressed-test Bacula source OK ===== "
    echo "  ===== sparse-compressed-test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index b8ed84ef8096baffe5d2148e4262cae30dd3a428..8b706ebf9cd3570c79d68560ea5930612172f5c7 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting sparse-test ==="
+echo " === Starting sparse-test ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -50,5 +51,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== sparse-test Bacula source OK ===== "
    echo "  ===== sparse-test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index e2671141b1ae71bdb5930d46827068bce6208fc0..fc66da77e98db99c90a773a139fade022861662b 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting two-jobs-test  ==="
+echo " === Starting two-jobs-test  ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -62,5 +63,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== two-jobs-test Bacula source OK ===== "
    echo "  ===== two-jobs-test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
+   scripts/cleanup
 fi

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 2192c86dae3b420dbb8031bd188fe51891d02aaa..e79bbe33323b167f20c22b66745488fcfa41161b 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -5,7 +5,7 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf tmp/TestVolume001 tmp/TestVolume002 tmp/bacula-restores
+scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting two-vol-test  ==="
+echo " === Starting two-vol-test  ===" >tmp/log
 echo " "
 
 bin/bacula start
@@ -55,5 +56,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== two-vol-test Bacula source OK ===== "
    echo "  ===== two-vol-test OK ===== " >>test.out
-   rm -rf tmp/bacula-restores tmp/TestVolume001 tmp/TestVolume002
+   scripts/cleanup
 fi

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 5cd729795618095f1e1c466ae24b4f6f4535a0f5..59de6970bae23602e2881c282adc6241b8213559 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -5,8 +5,8 @@
 #
 cwd=`pwd`
 scripts/copy-test-confs
-rm -rf /tmp/TestVolume001 /tmp/bacula-restores
-rm -f tmp/original
+scripts/cleanup
+echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
 bin/drop_sqlite_tables
 bin/make_sqlite_tables
@@ -14,6 +14,7 @@ bin/make_sqlite_tables
 echo " "
 echo " "
 echo " === Starting verify Volume Test ==="
+echo " === Starting verify Volume Test ===" >>tmp/log
 echo " "
 
 bin/bacula start
@@ -50,6 +51,5 @@ if [ $? != 0 ] ; then
 else
    echo "  ===== Verify Volume Test OK ===== "
    echo "  ===== Verify Volume Test OK ===== " >>test.out
-   rm -rf /tmp/bacula-restores /tmp/TestVolume001
-   rm -f ${cwd}/tmp/original
+   scripts/cleanup
 fi