more cleanup and patch from bug #859

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4872 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/scripts/cleanup b/regress/scripts/cleanup
index d1eaea50402b17d87fffeedd70e485f544691af9..b52f6e381dd883a4bf9a61962e1a0bc8022c9536 100755 (executable)
--- a/regress/scripts/cleanup
+++ b/regress/scripts/cleanup
@@ -4,14 +4,11 @@
 #
 rm -rf /tmp/FileVolume* tmp/FileVolume*  
 rm -rf /tmp/TestVolume001 /tmp/bacula-restores /tmp/Small*
-rm -rf tmp/original tmp/bacula-restores tmp/Small* tmp/TestVolume*
-rm -rf tmp/restored tmp/largefile tmp/bscan.bsr tmp/log*.out
 rm -rf /tmp/sed_tmp /tmp/file-list
-rm -rf tmp/build tmp/restore-list tmp/restore2-list
-rm -rf tmp/fd.out tmp/dir.out tmp/sd.out tmp/*.jpg
+rm -rf tmp/*
 rm -rf working/log tmp/TEST-*
 rm -rf working/*.bsr
-rm -rf tmp/disk-changer /tmp/disk-changer
+rm -rf /tmp/disk-changer
 find . -name "gigaslam.gif" -exec rm -f {} \;
 
 bin/bacula stop 2>&1 >/dev/null

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index 3145e1843e4b6f9cd02c8babece874a66218ad3a..f68ea08fb65d9771ca5a77672406bc139bbc30ba 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -7,7 +7,18 @@ if test "x${CONFIG_SHELL}" != "x"; then
     CONFIG_SHELL=/bin/sh
 fi
 
-CFLAGS="-g -O2 -Wall" \
+# Handle Solaris compiler (possibly some others) 
+VERSION="`cc --version | head -1 | awk '{ print $2 }' 2> /dev/null`"
+
+if [ -n "${VERSION}" -a "${VERSION}" = "(GCC)" ]; then
+  OPTIMIZE="-O2"
+  WARNINGS="-Wall"
+else
+  OPTIMIZE="-O"
+  WARNINGS="-v"
+fi
+
+CFLAGS="-g ${OPTIMIZE} ${WARNINGS}" \
  ./configure \
     --sbindir=$1/bin \
     --sysconfdir=$1/bin \