Index: trunk/test/test.sh
===================================================================
--- trunk/test/test.sh	(revision 171)
+++ trunk/test/test.sh	(revision 172)
@@ -435,5 +435,5 @@
     rm -f ./.samhain_log*
     rm -f ./.samhain_lock*
-    test -d testrun_testdata && chmod -R 0700 testrun_testdata
+    test -d testrun_testdata && chmod -f -R 0700 testrun_testdata
     test -d .quarantine && rm -rf .quarantine
     rm -rf testrun_testdata
Index: trunk/test/testcompile.sh
===================================================================
--- trunk/test/testcompile.sh	(revision 171)
+++ trunk/test/testcompile.sh	(revision 172)
@@ -98,7 +98,7 @@
     #
     cd src/
-    stat=`uno -DUSE_UNO=1 -t -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc-portable.c zAVLTree.c trustfile.c rijndael-*.c bignum.c 2>&1 | wc -l`
+    stat=`uno -DHAVE_MMAP=1 -DUSE_UNO=1 -t -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c 2>&1 | wc -l`
     if [ $stat -ne 1 ]; then
-	uno -DSH_WITH_CLIENT -DSH_WITH_SERVER -DUSE_UNO=1 -t -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc-portable.c zAVLTree.c trustfile.c rijndael-*.c bignum.c >>../test_log 2>&1
+	uno -DSH_WITH_CLIENT -DSH_WITH_SERVER -DHAVE_MMAP=1 -DUSE_UNO=1 -t -I. -I.. -I../include sh_*.c samhain.c slib.c dnmalloc.c zAVLTree.c trustfile.c rijndael-*.c bignum.c >>../test_log 2>&1
 	retval=1
 	[ -z "$quiet" ] && log_fail $2 ${MAXTEST} "$TEST (uno)";
@@ -232,10 +232,13 @@
 
 	if [ "x$doall" = xon ]; then
-	    if [ -f /usr/local/gcc-smatch/bin/gcc ]; then  # FIXME
-		SAVE_CC="${CC}"
-		SMATCH="DBGDEF=--smatch"; export SMATCH
-		SAVE_SMATCH="${SMATCH}"; export SAVE_SMATCH
-		CC="/usr/local/gcc-smatch/bin/gcc"; export CC
-		SMATCH_CC="${CC}"
+	    uname -a | grep x86_64 >/dev/null 
+	    if [ $? -ne 0 ]; then
+		if [ -f /usr/local/gcc-smatch/bin/gcc ]; then  # FIXME
+		    SAVE_CC="${CC}"
+		    SMATCH="DBGDEF=--smatch"; export SMATCH
+		    SAVE_SMATCH="${SMATCH}"; export SAVE_SMATCH
+		    CC="/usr/local/gcc-smatch/bin/gcc"; export CC
+		    SMATCH_CC="${CC}"
+		fi
 	    fi
 	fi
Index: trunk/test/testrun_1.sh
===================================================================
--- trunk/test/testrun_1.sh	(revision 171)
+++ trunk/test/testrun_1.sh	(revision 172)
@@ -1116,6 +1116,6 @@
     if test -d "$BASE"; then
 	if [ -d "${BASE}" ]; then
-	    chmod -R 0700 "${BASE}" || {
-		[ -z "$quiet" ] &&   log_msg_fail "chmod -R 0700 ${BASE}"; 
+	    chmod -f -R 0700 "${BASE}" || {
+		[ -z "$quiet" ] &&   log_msg_fail "chmod -f -R 0700 ${BASE}"; 
 		return 1;
 	    }
Index: trunk/test/testrun_2a.sh
===================================================================
--- trunk/test/testrun_2a.sh	(revision 171)
+++ trunk/test/testrun_2a.sh	(revision 172)
@@ -23,7 +23,7 @@
 RCFILE="$PW_DIR/testrc_2";  export RCFILE
 
-SERVER_BUILDOPTS="--quiet  $TRUST  --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
-
-CLIENT_BUILDOPTS="--quiet  $TRUST --enable-debug --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
+SERVER_BUILDOPTS="--quiet  $TRUST --enable-network=server --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$PW_DIR/testrc_2 --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=${SH_LOCALHOST}  --with-log-file=$PW_DIR/.samhain_log --with-pid-file=$PW_DIR/.samhain_lock"; export SERVER_BUILDOPTS
+
+CLIENT_BUILDOPTS="--quiet  $TRUST --enable-network=client --enable-srp --prefix=$PW_DIR --with-tmp-dir=$PW_DIR --localstatedir=$PW_DIR --with-config-file=REQ_FROM_SERVER$RCFILE --with-data-file=REQ_FROM_SERVER$PW_DIR/.samhain_file --with-logserver=localhost  --with-log-file=$LOGFILE --with-pid-file=$PW_DIR/.samhain_lock --enable-suidcheck"; export CLIENT_BUILDOPTS
 
 do_test_1_a () {
@@ -250,6 +250,6 @@
     CLIENT_BUILDOPTS_ORIG="${CLIENT_BUILDOPTS}"
     #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-srp"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-srp"
+    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-srp"; export SERVER_BUILDOPTS
+    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-srp"; export CLIENT_BUILDOPTS
     #
     testrun2a_internal
@@ -261,6 +261,6 @@
     fi
     #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-encrypt"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-encrypt"
+    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --disable-encrypt"; export SERVER_BUILDOPTS
+    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --disable-encrypt"; export CLIENT_BUILDOPTS
     #
     testrun2a_internal
@@ -272,6 +272,6 @@
     fi
     #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --enable-encrypt=1"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"
+    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG} --enable-encrypt=1"; export SERVER_BUILDOPTS
+    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS
     #
     testrun2a_internal
@@ -283,6 +283,6 @@
     fi
     #
-    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG}"
-    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"
+    SERVER_BUILDOPTS="${SERVER_BUILDOPTS_ORIG}"; export SERVER_BUILDOPTS
+    CLIENT_BUILDOPTS="${CLIENT_BUILDOPTS_ORIG} --enable-encrypt=1"; export CLIENT_BUILDOPTS
     #
     testrun2a_internal
Index: trunk/test/testtimesrv.sh
===================================================================
--- trunk/test/testtimesrv.sh	(revision 171)
+++ trunk/test/testtimesrv.sh	(revision 172)
@@ -31,6 +31,6 @@
 {
     if test -d "$BASE"; then
-	chmod -R 0700 "${BASE}" || {
-	    [ -z "$quiet" ] &&   log_msg_fail "chmod -R 0700 ${BASE}"; 
+	chmod -f -R 0700 "${BASE}" || {
+	    [ -z "$quiet" ] &&   log_msg_fail "chmod -f -R 0700 ${BASE}"; 
 	    return 1;
 	}