From d262fc2e0ff80472594bd931971512971ff4af04 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 17 Jun 2016 09:43:51 -0400 Subject: [PATCH] tests: Support OT_SKIP_READDIR_RAND For some reason I'm really not inclined to debug right now, `libtool` is eating the `-fsanitize=address` argument when linking `libreaddir-rand.so`, which causes failures since we're trying to `LD_PRELOAD`. Closes: #351 Approved by: jlebon --- tests/libtest.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/libtest.sh b/tests/libtest.sh index 16d5c0e0..2d064299 100755 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -80,7 +80,14 @@ fi if test -n "${OT_TESTS_VALGRIND:-}"; then CMD_PREFIX="env G_SLICE=always-malloc OSTREE_SUPPRESS_SYNCFS=1 valgrind -q --error-exitcode=1 --leak-check=full --num-callers=30 --suppressions=${test_srcdir}/glib.supp --suppressions=${test_srcdir}/ostree.supp" else - CMD_PREFIX="env LD_PRELOAD=${test_builddir}/libreaddir-rand.so" + # In some cases the LD_PRELOAD may cause obscure problems, + # e.g. right now it breaks for me with -fsanitize=address, so + # let's allow users to skip it. + if test -z "${OT_SKIP_READDIR_RAND:-}"; then + CMD_PREFIX="env LD_PRELOAD=${test_builddir}/libreaddir-rand.so" + else + CMD_PREFIX="" + fi fi assert_streq () {