From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 17 Oct 2009 15:05:17 +0000 (+0200)
Subject: Don't enable SUN compiler by default and make the configdir configurable.
X-Git-Tag: Release-5.0.0~282^2~9^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=edc717d4ef0c7e2d8c2098cfc0f142319b8fdb08;p=bacula%2Fbacula

Don't enable SUN compiler by default and make the configdir configurable.
---

diff --git a/regress/run_bacula_regression b/regress/run_bacula_regression
index b20979191e..0c8dcfd54c 100755
--- a/regress/run_bacula_regression
+++ b/regress/run_bacula_regression
@@ -18,14 +18,19 @@ BACULA_REGRESS_HOME="/bacula_regress"
 export BACULA_REGRESS_HOME
 
 #
-# Lets use the SUN compiler
+# Directory where regress config templates are stored per db type.
 #
-CC="/usr/bin/cc"
-CXX="/usr/bin/CC"
-CFLAGS="-fast"
-CXXFLAGS="-fast"
+CONFIG_DIR="/root/configs"
 
-export CC CXX CFLAGS CXXFLAGS
+#
+# Lets use the SUN compiler
+#
+#CC="/usr/bin/cc"
+#CXX="/usr/bin/CC"
+#CFLAGS="-fast"
+#CXXFLAGS="-fast"
+#
+#export CC CXX CFLAGS CXXFLAGS
 
 #
 # Regression script to run
@@ -51,8 +56,8 @@ run_sqlite3_regression()
    #
    # Run regression using sqlite3
    #
-   if [ -f /root/configs/config.sqlite3 ]; then
-      ln -sf /root/configs/config.sqlite3 config
+   if [ -f ${CONFIG_DIR}/config.sqlite3 ]; then
+      ln -sf ${CONFIG_DIR}/config.sqlite3 config
       if [ $? = 0 ]; then
          run_regression
       fi
@@ -64,8 +69,8 @@ run_postgresql_regression()
    #
    # Run regression using postgresql
    #
-   if [ -f /root/configs/config.postgresql ]; then
-      ln -sf /root/configs/config.postgresql config
+   if [ -f ${CONFIG_DIR}/config.postgresql ]; then
+      ln -sf ${CONFIG_DIR}/config.postgresql config
       if [ $? = 0 ]; then
          run_regression
       fi
@@ -77,8 +82,8 @@ run_mysql_regression()
    #
    # Run regression using mysql
    #
-   if [ -f /root/configs/config.mysql ]; then
-      ln -sf /root/configs/config.mysql config
+   if [ -f ${CONFIG_DIR}/config.mysql ]; then
+      ln -sf ${CONFIG_DIR}/config.mysql config
       if [ $? = 0 ]; then
          run_regression
       fi