FreeBSD build changes and allow to run the tests.

This commit is contained in:
David Carlier 2018-08-05 10:37:53 +01:00 committed by David Goldblatt
parent e8ec9528ab
commit 0771ff2cea
3 changed files with 29 additions and 11 deletions

View File

@ -115,9 +115,16 @@ struct malloc_mutex_s {
{{{LOCK_PROF_DATA_INITIALIZER, 0}}, \ {{{LOCK_PROF_DATA_INITIALIZER, 0}}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)} WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
#elif (defined(JEMALLOC_MUTEX_INIT_CB)) #elif (defined(JEMALLOC_MUTEX_INIT_CB))
# if (defined(JEMALLOC_DEBUG))
# define MALLOC_MUTEX_INITIALIZER \
{{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT), 0}
# else
# define MALLOC_MUTEX_INITIALIZER \ # define MALLOC_MUTEX_INITIALIZER \
{{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \ {{{LOCK_PROF_DATA_INITIALIZER, PTHREAD_MUTEX_INITIALIZER, NULL}}, \
WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)} WITNESS_INITIALIZER("mutex", WITNESS_RANK_OMIT)}
# endif
#else #else
# define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT # define MALLOC_MUTEX_TYPE PTHREAD_MUTEX_DEFAULT
# if defined(JEMALLOC_DEBUG) # if defined(JEMALLOC_DEBUG)

View File

@ -4,6 +4,7 @@ import sys
from itertools import combinations from itertools import combinations
from os import uname from os import uname
from multiprocessing import cpu_count from multiprocessing import cpu_count
from subprocess import call
# Later, we want to test extended vaddr support. Apparently, the "real" way of # Later, we want to test extended vaddr support. Apparently, the "real" way of
# checking this is flaky on OS X. # checking this is flaky on OS X.
@ -13,13 +14,25 @@ nparallel = cpu_count() * 2
uname = uname()[0] uname = uname()[0]
if "BSD" in uname:
make_cmd = 'gmake'
else:
make_cmd = 'make'
def powerset(items): def powerset(items):
result = [] result = []
for i in xrange(len(items) + 1): for i in xrange(len(items) + 1):
result += combinations(items, i) result += combinations(items, i)
return result return result
possible_compilers = [('gcc', 'g++'), ('clang', 'clang++')] possible_compilers = []
for cc, cxx in (['gcc', 'g++'], ['clang', 'clang++']):
try:
cmd_ret = call([cc, "-v"])
if cmd_ret == 0:
possible_compilers.append((cc, cxx))
except:
pass
possible_compiler_opts = [ possible_compiler_opts = [
'-m32', '-m32',
] ]
@ -39,7 +52,7 @@ possible_malloc_conf_opts = [
] ]
print 'set -e' print 'set -e'
print 'if [ -f Makefile ] ; then make relclean ; fi' print 'if [ -f Makefile ] ; then %(make_cmd)s relclean ; fi' % {'make_cmd': make_cmd}
print 'autoconf' print 'autoconf'
print 'rm -rf run_tests.out' print 'rm -rf run_tests.out'
print 'mkdir run_tests.out' print 'mkdir run_tests.out'
@ -102,11 +115,11 @@ cd run_test_%(ind)d.out
echo "==> %(config_line)s" >> run_test.log echo "==> %(config_line)s" >> run_test.log
%(config_line)s >> run_test.log 2>&1 || abort %(config_line)s >> run_test.log 2>&1 || abort
run_cmd make all tests run_cmd %(make_cmd)s all tests
run_cmd make check run_cmd %(make_cmd)s check
run_cmd make distclean run_cmd %(make_cmd)s distclean
EOF EOF
chmod 755 run_test_%(ind)d.sh""" % {'ind': ind, 'config_line': config_line} chmod 755 run_test_%(ind)d.sh""" % {'ind': ind, 'config_line': config_line, 'make_cmd': make_cmd}
ind += 1 ind += 1
print 'for i in `seq 0 %(last_ind)d` ; do echo run_test_${i}.sh ; done | xargs -P %(nparallel)d -n 1 sh' % {'last_ind': ind-1, 'nparallel': nparallel} print 'for i in `seq 0 %(last_ind)d` ; do echo run_test_${i}.sh ; done | xargs -P %(nparallel)d -n 1 sh' % {'last_ind': ind-1, 'nparallel': nparallel}

View File

@ -390,8 +390,6 @@ os_page_detect(void) {
SYSTEM_INFO si; SYSTEM_INFO si;
GetSystemInfo(&si); GetSystemInfo(&si);
return si.dwPageSize; return si.dwPageSize;
#elif defined(__FreeBSD__)
return getpagesize();
#else #else
long result = sysconf(_SC_PAGESIZE); long result = sysconf(_SC_PAGESIZE);
if (result == -1) { if (result == -1) {