Updates

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

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 3181eba100ca12567670fc2c104e6736797a33e2..859745edf3b862ec0926667665fe04889234110e 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
@@ -21,11 +21,9 @@ cwd=`pwd`
 scripts/copy-test-confs
 scripts/cleanup
 echo "/etc" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+
 bin/bacula start 2>&1 >/dev/null
-bin/console -c bin/console.conf <<END_OF_DATA
+bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
 @output tmp/log1.out
@@ -39,7 +37,10 @@ messages
 @# now do a restore
 @#
 @output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores current all
+restore where=${cwd}/tmp/bacula-restores select    
+unmark *
+mark *
+done
 yes
 wait
 messages
@@ -59,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 ===== "