Update

[bacula/bacula] / regress / tests / etc-test-root

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 59ec79755f9b5e733f3681f48b88610a3b3d0dee..e3a4495b88cf033391ac2171d2127b4b4b86f80c 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -7,8 +7,8 @@ MUID=`/usr/bin/id -u`
 if [ $MUID != 0 ] ; then
    echo " "
    echo "You must be root to run this test."
-   echo "  ===== etc-test-root failed!!! ===== "
-   echo "  ===== etc-test-root failed!!! ===== " >>test.out
+   echo "  ===== !!!! etc-test-root not run !!!! ===== "
+   echo "  ===== !!!! etc-test-root not run !!!! ===== " >>test.out
    echo " "
    exit 1
 fi
@@ -18,15 +18,10 @@ echo " === Starting /etc save/restore test ==="
 echo " "
 echo " "
 cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
+scripts/copy-test-confs
 echo "/etc" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
+
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
@@ -65,8 +60,8 @@ diff tmp/original tmp/restored 2>&1 1>/dev/null
 if [ $? != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== etc-test-root failed!!! ===== "
-   echo "  ===== etc-test-root failed!!! ===== " >>test.out
+   echo "  ===== !!!! etc-test-root failed !!!! ===== "
+   echo "  ===== !!!! etc-test-root failed !!!! ===== " >>test.out
    echo " "
 else
    echo "  ===== etc-test-root OK ===== "