Move the definition of catalog_db[] into cats. Change it to db_get_type() which...

[bacula/bacula] / regress / Makefile.in

diff --git a/regress/Makefile.in b/regress/Makefile.in
index fb73118a865313aa5cb987083377356a9fbe4b06..535c3722cfdfa3162f6f9aa5ec77803a67183546 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -31,8 +31,8 @@ bacula: all
         fi)
        rm -rf tmp working
        mkdir tmp working
-       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS}"
-       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST}
+       echo "Doing: scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${OPENSSL}"
+       scripts/setup ${BACULA_SOURCE} ${EMAIL} ${WHICHDB} ${TCPWRAPPERS} ${SMTP_HOST} ${OPENSSL}
 
 sed:
        echo "Doing: scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH} ${TAPE_DRIVE1} ${SMTP_HOST}"
@@ -53,7 +53,7 @@ root_test:
 clean:
        scripts/cleanup
        rm -f /tmp/file-list
-       rm -f tmp/* working/*
+       rm -fr tmp/* working/*
        rm -f test.out
        rm -f diff
        rm -f 1 2 3 scripts/1 scripts/2 scripts/3 tests/1 tests/2 tests/3