ebl Test postgresql encoding at the start of the test

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 8292d8717fa612e4bdfced7717210a8224b6f768..62b592eb2bd70e0430bc0ba66e31dafd7b406969 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -19,24 +19,34 @@ if [ ! -d ${BACULA_SOURCE} ] ; then
    echo " "
    exit 1
 fi
+
+# we build and setup binaries to the $cwd/bin directory not $bin
 rm -rf build bin
 # Copy new source
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
+cd build
+rm -rf txt src/testprogs
+cd ..
+check_exit_code
+scripts/create_sed
+sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config
+chmod 755 scripts/regress-config
 cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Run Bacula configuration, make, install
 ./regress-config ${cwd}
 check_exit_code
-# Cleanup any win32 build in source
-cd src/win32
+# Cleanup any build in source
 make clean
-cd ../..
-make
+make -j3
 check_exit_code
 make install
 check_exit_code
+# eliminate non-essential directories to reduce
+#   size.  Otherwise regress run too long
+rm -rf src/win32 examples patches
 cp src/tools/testls ../bin
 check_exit_code
 
@@ -46,10 +56,10 @@ bin/bacula stop
 mkdir -p working
 cd bin
 echo "Running database creation scripts"
-./create_bacula_database bacula
-./drop_bacula_tables bacula
+./create_bacula_database
+./drop_bacula_tables
 ./make_bacula_tables
-./grant_bacula_privileges bacula
+./grant_bacula_privileges
 cd ${cwd}
 # Start and stop Bacula to ensure conf files are OK
 bin/bacula start