regress: more work on remote-fd test

[bacula/bacula] / regress / tests / btape-test-tape

diff --git a/regress/tests/btape-test-tape b/regress/tests/btape-test-tape
index 9faa43b80c5dfcb4dd0ad4987898d2e0dc3a4b0f..5e91e61f2021105d10bd873f9b7680995b6f838b 100755 (executable)
--- a/regress/tests/btape-test-tape
+++ b/regress/tests/btape-test-tape
@@ -15,12 +15,12 @@ change_jobname $JobName
 start_test
 
 if test "$debug" -eq 1 ; then
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log1.out
 test
 quit
 END_OF_DATA
 else
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
 test
 quit
 END_OF_DATA
@@ -29,8 +29,8 @@ fi
 if [ $? != 0 ] ; then
    echo " "
    echo " "
-   echo "  !!!!! btape fill test failed!!! !!!!! "
-   echo "  !!!!! btape fill test failed!!! !!!!! " >>test.out
+   echo "  !!!!! btape test failed!!! !!!!! "
+   echo "  !!!!! btape test failed!!! !!!!! " >>test.out
    echo " "
    exit 1
 fi
@@ -42,12 +42,12 @@ cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed -e 's%64512%262144%' ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
 if test "$debug" -eq 1 ; then
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA | tee ${cwd}/tmp/log2.out
 test
 quit
 END_OF_DATA
 else
-  $bin/btape -c bin/bacula-sd.conf tape <<END_OF_DATA >${cwd}/tmp/log1.out 2>&1
+  $bin/btape -c bin/bacula-sd.conf Drive-0 <<END_OF_DATA >${cwd}/tmp/log2.out 2>&1
 test
 quit
 END_OF_DATA
@@ -56,11 +56,11 @@ fi
 if [ $? != 0 ] ; then
    echo " "
    echo " "
-   echo "  !!!!! btape fill test failed!!! !!!!! "
-   echo "  !!!!! btape fill test failed!!! !!!!! " >>test.out
+   echo "  !!!!! btape test failed!!! !!!!! "
+   echo "  !!!!! btape test failed!!! !!!!! " >>test.out
    echo " "
 else
-   echo "  ===== btape fill test OK ===== "
-   echo "  ===== btape fill test OK ===== " >>test.out
-#  scripts/cleanup
+   echo "  ===== btape test OK ===== "
+   echo "  ===== btape test OK ===== " >>test.out
+   scripts/cleanup
 fi