Changeset 172 for trunk/test/testcompile.sh

Timestamp:

Aug 7, 2008, 9:13:24 PM (16 years ago)

Author:

katerina

Message:

Documentation update, more dnmalloc fixes.

File:

• trunk/test/testcompile.sh (modified) (2 diffs)

trunk/test/testcompile.sh

@@ -98 +98 @@
     #
     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 +232 @@
 
         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