From ecd20a35e54bd1557832511dd2e2a2b2d77223be Mon Sep 17 00:00:00 2001 From: Adam Crume Date: Mon, 28 Jul 2014 16:32:15 -0700 Subject: [PATCH] lttng: Preload liblttng-ust-fork.so in TESTS_ENVIRONMENT This adds LD_PRELOAD=liblttng-ust-fork.so to TESTS_ENVIRONMENT. This prevents lttng from complaining when processes are forked. The complaints otherwise taint the output and cause tests to fail. Signed-off-by: Adam Crume --- src/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Makefile.am b/src/Makefile.am index c11c07344a572..41243a2fa4045 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -269,6 +269,12 @@ TESTS = \ check-local: $(srcdir)/test/encoding/readable.sh ../ceph-object-corpus +if WITH_LTTNG +# TODO: If we're running the parallel test harness (the preferred harness), this should be AM_TESTS_ENVIRONMENT instead. +# See: https://www.gnu.org/software/automake/manual/html_node/Scripts_002dbased-Testsuites.html +# I don't see the serial-tests Automake option anywhere, but my AM_TESTS_ENVIRONMENT was being ignored. +TESTS_ENVIRONMENT = LD_PRELOAD=liblttng-ust-fork.so; export LD_PRELOAD; echo "LD_PRELOAD=$${LD_PRELOAD}"; +endif # base targets -- 2.39.5