]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
lttng: Preload liblttng-ust-fork.so in TESTS_ENVIRONMENT
authorAdam Crume <adamcrume@gmail.com>
Mon, 28 Jul 2014 23:32:15 +0000 (16:32 -0700)
committerAdam Crume <adamcrume@gmail.com>
Wed, 13 Aug 2014 20:58:19 +0000 (13:58 -0700)
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 <adamcrume@gmail.com>
src/Makefile.am

index c11c07344a572e694b8223a9dc16f712edfc7b19..41243a2fa40456bfa9caf25cde633e51cffe2fbb 100644 (file)
@@ -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