Disable percpu_arena by default.

2 files changed, 14 insertions, 4 deletions

diff --git a/scripts/gen_run_tests.py b/scripts/gen_run_tests.py
index 9fbf71e5..875c6d03 100755
--- a/scripts/gen_run_tests.py
+++ b/scripts/gen_run_tests.py
@@ -23,6 +23,7 @@ possible_config_opts = [
 possible_malloc_conf_opts = [
     'tcache:false',
     'dss:primary',
+    'percpu_arena:percpu',
 ]
 
 print 'set -e'
@@ -45,13 +46,20 @@ for cc, cxx in possible_compilers:
                     ",".join(malloc_conf_opts) if len(malloc_conf_opts) > 0
                     else '')
                 )
+
+                # Per CPU arenas are only supported on Linux.
+                linux_supported = ('percpu_arena:percpu' in malloc_conf_opts)
                 # Heap profiling and dss are not supported on OS X.
                 darwin_unsupported = ('--enable-prof' in config_opts or \
                   'dss:primary' in malloc_conf_opts)
-                if darwin_unsupported:
+                if linux_supported:
+                    print 'if [[ "$unamestr" = "Linux" ]]; then'
+                elif darwin_unsupported:
                     print 'if [[ "$unamestr" != "Darwin" ]]; then'
+
                 print config_line
                 print "make clean"
                 print "make -j" + str(MAKE_J_VAL) + " check"
-                if darwin_unsupported:
+
+                if linux_supported or darwin_unsupported:
                     print 'fi'
diff --git a/scripts/gen_travis.py b/scripts/gen_travis.py
index 4a4c2144..26997b25 100755
--- a/scripts/gen_travis.py
+++ b/scripts/gen_travis.py
@@ -48,6 +48,7 @@ configure_flag_unusuals = [
 malloc_conf_unusuals = [
     'tcache:false',
     'dss:primary',
+    'percpu_arena:percpu',
 ]
 
 all_unusuals = (
@@ -77,8 +78,9 @@ for unusual_combination in unusual_combinations_to_test:
 
     malloc_conf = [
         x for x in unusual_combination if x in malloc_conf_unusuals]
-    # Filter out an unsupported configuration - dss on OS X.
-    if os == 'osx' and 'dss:primary' in malloc_conf:
+    # Filter out unsupported configurations on OS X.
+    if os == 'osx' and ('dss:primary' in malloc_conf or \
+      'percpu_arena:percpu' in malloc_conf):
         continue
     if len(malloc_conf) > 0:
         configure_flags.append('--with-malloc-conf=' + ",".join(malloc_conf))