From 5805bf0391830c4593532da911208716c0cc1c39 Mon Sep 17 00:00:00 2001 From: Eric Bollengier Date: Thu, 13 Mar 2008 15:01:07 +0000 Subject: [PATCH] ebl Add a test for multiple command in runscript git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6604 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/prototype.conf | 14 +++++++------- regress/tests/runscript-test | 10 ++++++---- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/regress/prototype.conf b/regress/prototype.conf index c5381a28d1..7e67481393 100644 --- a/regress/prototype.conf +++ b/regress/prototype.conf @@ -1,17 +1,17 @@ # Where to get the source to be tested -BACULA_SOURCE="${HOME}/bacula/bacula" +BACULA_SOURCE="${HOME}/dev/bacula" # Where to send email !!!!! Change me !!!!!!! -EMAIL=my-name@domain.com +EMAIL=ebollengier@sigma.fr SMTP_HOST="localhost" # Full "default" path where to find sqlite (no quotes!) SQLITE3_DIR=${HOME}/bacula/depkgs/sqlite3 SQLITE_DIR=${HOME}/bacula/depkgs/sqlite -TAPE_DRIVE="/dev/nst0" +TAPE_DRIVE="/dev/null" # if you don't have an autochanger set AUTOCHANGER to /dev/null -AUTOCHANGER="/dev/sg0" +AUTOCHANGER="/dev/null" # For two drive tests -- set to /dev/null if you do not have it TAPE_DRIVE1="/dev/null" @@ -21,11 +21,11 @@ AUTOCHANGER_PATH="/usr/sbin/mtx" # Set your database here #WHICHDB="--with-sqlite=${SQLITE_DIR}" #WHICHDB="--with-sqlite3=${SQLITE3_DIR}" -#WHICHDB="--with-postgresql" -WHICHDB="--with-mysql" +WHICHDB="--with-postgresql" +#WHICHDB="--with-mysql" # Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers" -TCPWRAPPERS="--with-tcp-wrappers" +#TCPWRAPPERS="--with-tcp-wrappers" # Set this to "" to disable OpenSSL support, "--with-openssl=yes" # to enable it, or provide the path to the OpenSSL installation, diff --git a/regress/tests/runscript-test b/regress/tests/runscript-test index b32f9aab09..137960e41a 100755 --- a/regress/tests/runscript-test +++ b/regress/tests/runscript-test @@ -95,13 +95,15 @@ grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED1"' ${cwd}/tmp a=$? grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED2"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 b=$? -grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'shell command: run ClientBeforeJob "/bin/false RUN_FD_FAILED3"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 c=$? -grep 'touching' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'shell command: run AfterJob "/bin/echo RunAfterFailedJob"' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 d=$? -grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +grep 'touching' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 e=$? -if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 ] +grep '*** Backup Error ***' ${cwd}/tmp/RUN_FD_FAILED.log >/dev/null 2>&1 +f=$? +if [ $a = 0 -a $b = 0 -a $c = 0 -a $d = 0 -a $e = 0 -a $f = 0 ] then [ "$debug" = 1 ] && echo RUN_FD_FAILED ok else -- 2.39.5