From 2282073843dd5f881f3d1f5f7ae9d818f43440f6 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Mon, 9 Jun 2008 20:59:55 +0000 Subject: [PATCH] ebl rename faketape to vtape git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7125 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/{README.faketape => README.vtape} | 10 +++------- regress/prototype.conf | 4 ++-- ...ketape.conf.in => bacula-dir-vtape.conf.in} | 0 ...aketape.conf.in => bacula-sd-vtape.conf.in} | 0 regress/scripts/do_sed | 4 ++-- regress/scripts/functions | 8 ++++---- regress/scripts/prepare-fake-autochanger.in | 2 +- ...aketape-test-changer => vtape-test-changer} | 18 +++++++++--------- 8 files changed, 21 insertions(+), 25 deletions(-) rename regress/{README.faketape => README.vtape} (77%) rename regress/scripts/{bacula-dir-faketape.conf.in => bacula-dir-vtape.conf.in} (100%) rename regress/scripts/{bacula-sd-faketape.conf.in => bacula-sd-vtape.conf.in} (100%) rename regress/tests/{faketape-test-changer => vtape-test-changer} (85%) diff --git a/regress/README.faketape b/regress/README.vtape similarity index 77% rename from regress/README.faketape rename to regress/README.vtape index ad98176a3d..4e6c88219e 100644 --- a/regress/README.faketape +++ b/regress/README.vtape @@ -4,7 +4,7 @@ HOWTO SETUP A FAKE TAPE ENVIRONMENT Introduction: ------------- -The fake tape driver attempts to simulate a tape drive from a low level +The fake tape driver (vtape) attempts to simulate a tape drive from a low level aspect. It emulates tape operations like fsf, bsf, weom, variable bloc, etc.. For that the driver implements 5 operations : @@ -14,10 +14,6 @@ For that the driver implements 5 operations : - close - ioctl -If your bacula's binaries are compiled with fake tape support, you won't be -able to use real tape drive. - - Setup the regress environment for tape tests -------------------------------------------- @@ -30,7 +26,7 @@ DRIVE2=1 SLOT1=1 SLOT2=2 AUTOCHANGER="/tmp/ach_config" -USE_FAKETAPE=yes +USE_VTAPE=yes AUTOCHANGER_SCRIPT=disk-changer You can remplace /tmp/ by what you want. @@ -47,7 +43,7 @@ That all ! Setup a quite big autochanger (5 drives and 80 slots) ----------------------------------------------------- -Just run "./tests/faketape-test-changer" test to use right configuration files, +Just run "./tests/vtape-test-changer" test to use right configuration files, then you can use "./scripts/prepare-fake-autochanger" script to initialize the dummy autochanger. diff --git a/regress/prototype.conf b/regress/prototype.conf index b822d6b560..5af6ba96f4 100644 --- a/regress/prototype.conf +++ b/regress/prototype.conf @@ -33,9 +33,9 @@ SLOT2=2 TAPE_DRIVE1="/dev/null" # Set this if you are using fake tape driver -#USE_FAKETAPE=--enable-faketape +#USE_VTAPE=yes -# Change this to use disk-changer with faketape +# Change this to use disk-changer with vtape AUTOCHANGER_SCRIPT=mtx-changer # This must be the path to the autochanger including its name diff --git a/regress/scripts/bacula-dir-faketape.conf.in b/regress/scripts/bacula-dir-vtape.conf.in similarity index 100% rename from regress/scripts/bacula-dir-faketape.conf.in rename to regress/scripts/bacula-dir-vtape.conf.in diff --git a/regress/scripts/bacula-sd-faketape.conf.in b/regress/scripts/bacula-sd-vtape.conf.in similarity index 100% rename from regress/scripts/bacula-sd-faketape.conf.in rename to regress/scripts/bacula-sd-vtape.conf.in diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index 0f2df3ab4a..b23e054249 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -41,8 +41,8 @@ sed -f ${out} ${cwd}/scripts/cleanup-2tape.in >${cwd}/scripts/cleanup-2tape sed -f ${out} ${cwd}/scripts/cleanup-2drive.in >${cwd}/scripts/cleanup-2drive sed -f ${out} ${cwd}/scripts/prepare-two-tapes.in >${cwd}/scripts/prepare-two-tapes sed -f ${out} ${cwd}/scripts/bacula-dir.conf.testrunscript.in >${cwd}/scripts/bacula-dir.conf.testrunscript -sed -f ${out} ${cwd}/scripts/bacula-dir-faketape.conf.in >${cwd}/scripts/bacula-dir-faketape.conf -sed -f ${out} ${cwd}/scripts/bacula-sd-faketape.conf.in >${cwd}/scripts/bacula-sd-faketape.conf +sed -f ${out} ${cwd}/scripts/bacula-dir-vtape.conf.in >${cwd}/scripts/bacula-dir-vtape.conf +sed -f ${out} ${cwd}/scripts/bacula-sd-vtape.conf.in >${cwd}/scripts/bacula-sd-vtape.conf sed -f ${out} ${cwd}/scripts/prepare-fake-autochanger.in >${cwd}/scripts/prepare-fake-autochanger sed -f ${out} ${cwd}/scripts/tls-bacula-fd.conf.in >${cwd}/scripts/tls-bacula-fd.conf sed -f ${out} ${cwd}/scripts/tls-bacula-sd.conf.in >${cwd}/scripts/tls-bacula-sd.conf diff --git a/regress/scripts/functions b/regress/scripts/functions index 61d6eb4999..391fc482f6 100644 --- a/regress/scripts/functions +++ b/regress/scripts/functions @@ -56,10 +56,10 @@ if test x${AUTOCHANGER} = x/dev/null ; then fi } -require_faketape() +require_vtape() { -if test x${USE_FAKETAPE} = x ; then - echo "$TestName test needs the faketape driver." +if test x${USE_VTAPE} = x ; then + echo "$TestName test needs the vtape driver." exit 1 fi } @@ -262,7 +262,7 @@ debug_wait() init_drive() { - if test a$USE_FAKETAPE = a; then + if test a$USE_VTAPE = a; then mt -f $1 rewind mt -f $1 weof else diff --git a/regress/scripts/prepare-fake-autochanger.in b/regress/scripts/prepare-fake-autochanger.in index 799dbd2f3f..f4f394d0af 100644 --- a/regress/scripts/prepare-fake-autochanger.in +++ b/regress/scripts/prepare-fake-autochanger.in @@ -6,7 +6,7 @@ . scripts/functions # check if user wants to run this test -if test x$USE_FAKETAPE = x; then +if test x$USE_VTAPE = x; then exit 1 fi diff --git a/regress/tests/faketape-test-changer b/regress/tests/vtape-test-changer similarity index 85% rename from regress/tests/faketape-test-changer rename to regress/tests/vtape-test-changer index 93496fc234..de3fdacc59 100755 --- a/regress/tests/faketape-test-changer +++ b/regress/tests/vtape-test-changer @@ -7,20 +7,20 @@ # TAPE_DRIVE="$cwd/working/ach/drive0" # TAPE_DRIVE1="$cwd/working/ach/drive0" # AUTOCHANGER="$cwd/working/ach/conf" -# USE_FAKETAPE=--enable-faketape +# USE_VTAPE=yes # AUTOCHANGER_SCRIPT=disk-changer # -TestName="faketape-test-changer" +TestName="vtape-test-changer" JobName=backup . scripts/functions -require_faketape +require_vtape scripts/cleanup scripts/copy-tape-confs -cp scripts/bacula-dir-faketape.conf bin/bacula-dir.conf -cp scripts/bacula-sd-faketape.conf bin/bacula-sd.conf +cp scripts/bacula-dir-vtape.conf bin/bacula-dir.conf +cp scripts/bacula-sd-vtape.conf bin/bacula-sd.conf scripts/prepare-fake-autochanger echo "${cwd}/build" >${cwd}/tmp/file-list @@ -77,7 +77,7 @@ END_OF_DATA run_bacula check_for_zombie_jobs storage=LTO1 $clientname check_for_zombie_jobs storage=LTO3 $clientname -check_for_zombie_jobs storage=LTO1-ANSI_6 client=$clientname +check_for_zombie_jobs storage=LTO1-ANSI_6 $clientname touch ${cwd}/build/po/*.po @@ -98,9 +98,9 @@ messages END_OF_DATA run_bconsole -check_for_zombie_jobs storage=LTO1 client=$clientname -check_for_zombie_jobs storage=LTO3 client=$clientname -check_for_zombie_jobs storage=LTO1-ANSI_6 client=$clientname +check_for_zombie_jobs storage=LTO1 $clientname +check_for_zombie_jobs storage=LTO3 $clientname +check_for_zombie_jobs storage=LTO1-ANSI_6 $clientname stop_bacula check_two_logs -- 2.39.5