From 4ee1d5c44f616e1eea39a5237a651134a3c51f44 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 6 Jun 2005 21:06:16 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2111 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/scripts/flist | 6 +++++- regress/scripts/setup | 26 -------------------------- regress/tests/two-vol-test | 2 ++ 3 files changed, 7 insertions(+), 27 deletions(-) diff --git a/regress/scripts/flist b/regress/scripts/flist index ba8663a362..019eb57a0f 100644 --- a/regress/scripts/flist +++ b/regress/scripts/flist @@ -10,9 +10,13 @@ /build/platforms/Makefile.in /build/platforms/redhat/Makefile.in /build/scripts/Makefile.in -/build/src/filed/win32/bin/cygwin1.dll /build/src/filed/win32/winservice.cpp /build/src/filed/restore.c /build/autoconf/configure.in /build/examples/afs-bacula /build/src/win32/winbacula.nsi.in +/build/autoconf/configure.in +/build/src/version.h +/build/src/lib/message.c +/build/src/lib/bnet_server.c +/build/src/lib/libbac.a diff --git a/regress/scripts/setup b/regress/scripts/setup index b8923ea429..1f8ba1b5d7 100755 --- a/regress/scripts/setup +++ b/regress/scripts/setup @@ -21,32 +21,6 @@ cp -rp $1 build cp scripts/regress-config build cd build rm -f Makefile config.cache -# Remove files that may be too big -cd doc -if [ -d latex ] ; then - cd latex - make clean - cd .. -fi -if [ -d latex-fr ] ; then - cd latex-fr - make clean - cd .. -fi -if [ -d images ] ; then - cd images - rm -f *.png *.jpg *.gif *.eps - rm -rf hires - cd .. -fi -cd ${cwd}/build -if [ -d rescue/linux/cdrom/cdtree ] ; then - cd rescue/linux/cdrom/cdtree - rm -rf bacula-* - cd .. - rm -rf bootcd.iso -fi -cd ${cwd}/build # Run Bacula configuration, make, install ./regress-config ${cwd} $2 $3 $4 make diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test index f7a9694a91..ddf0931803 100755 --- a/regress/tests/two-vol-test +++ b/regress/tests/two-vol-test @@ -15,7 +15,9 @@ echo " === Starting two-vol-test at `date +%R:%S` ===" >working/log echo " " bin/bacula start 2>&1 >/dev/null +# bin/bacula start bin/bconsole -c bin/bconsole.conf <&1 >/dev/null +#bin/bconsole -c bin/bconsole.conf <