X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Fatlocal.in;h=5c0db2a788268a2f97a2a591a1d5d6803e93d66a;hb=0a407cd6f2129793940bfbd42dc39fe97e93e14b;hp=8d0f59d6780829e840df9536370883ef9e2bc682;hpb=2db1f87ec28c9e3f34e56202c9b5389cf84974c2;p=sliver-openvswitch.git

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 8d0f59d67..5c0db2a78 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,7 @@
 # -*- shell-script -*-
 HAVE_OPENSSL='@HAVE_OPENSSL@'
 HAVE_PYTHON='@HAVE_PYTHON@'
+EGREP='@EGREP@'
 PERL='@PERL@'
 
 if test x"$PYTHON" = x; then
@@ -24,6 +25,21 @@ export PYTHONIOENCODING
 PYTHONDONTWRITEBYTECODE=yes
 export PYTHONDONTWRITEBYTECODE
 
+# Test whether the current working directory name is all ASCII
+# characters.  Some Python code doesn't tolerate non-ASCII characters
+# in filenames very well, so if the current working directory is
+# non-ASCII then we skip the tests that run those programs.
+#
+# This would be just papering over a real problem, except that the
+# tests that we skip are launched from initscripts and thus normally
+# run in system directories with ASCII names.  (This problem only came
+# up at all because the Debian autobuilders do build in a top-level
+# directory named /«BUILDDIR».)
+case `pwd | tr -d ' -~'` in
+    '') non_ascii_cwd=false ;;
+    *) non_ascii_cwd=true
+esac
+
 if test $HAVE_PYTHON = yes; then
     if python -m argparse 2>/dev/null; then
         :
@@ -33,8 +49,22 @@ if test $HAVE_PYTHON = yes; then
     fi
 fi
 
-# Enable glibc malloc debugging features.
-MALLOC_CHECK_=2
-MALLOC_PERTURB_=165
-export MALLOC_CHECK_
-export MALLOC_PERTURB_
+# Enable malloc debugging features.
+case `uname` in
+Linux)
+    MALLOC_CHECK_=2
+    MALLOC_PERTURB_=165
+    export MALLOC_CHECK_
+    export MALLOC_PERTURB_
+    ;;
+FreeBSD)
+    case `uname -r` in
+    [789].*)
+        MALLOC_CONF=AJ
+        ;;
+    *)
+        MALLOC_CONF=abort:true,junk:true,redzone:true
+        ;;
+    esac
+    export MALLOC_CONF
+esac