From: Adam Crume Date: Mon, 28 Jul 2014 23:32:15 +0000 (-0700) Subject: lttng: Preload liblttng-ust-fork.so in TESTS_ENVIRONMENT X-Git-Tag: v0.86~231^2~37 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4939f9aeae73089ab82c1783d7afd9baafd784f;p=ceph.git 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 --- diff --git a/src/Makefile.am b/src/Makefile.am index adaf73e4762..b954f3f8d05 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -644,6 +644,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