summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Nový <ondrej.novy@firma.seznam.cz>2018-09-30 12:23:22 +0200
committerOndřej Nový <ondrej.novy@firma.seznam.cz>2018-10-01 16:35:35 +0200
commitb046ff7091e710ecafb31b13678e0092fd1d3fd7 (patch)
tree70fc3a5ebf7c04b98db42864e08c9bc79f02827f
parent7df6c251910c9b65fba698df39f3e99b5b9a8638 (diff)
downloadliberasurecode-b046ff7091e710ecafb31b13678e0092fd1d3fd7.tar.gz
Fix building with LD_LIBRARY_PATH set
If LD_LIBRARY_PATH is set to any value, build will fail, example: Making check in doc ... /bin/bash: line 1: /usr/lib/libeatmydata: No such file or directory ... See: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906480 Same is true for DYLD_LIBRARY_PATH and DYLD_FALLBACK_LIBRARY_PATH. This bug was introduced with commit 19442df2cd9a5bc8ec4deded7046ea7aca1d50a2 where Kota removed evals, but forgot to remove prepending of same env variables. Change-Id: Ib7a1d6b839d4a207ee0471b55233e1ce5d958705
-rw-r--r--Makefile.am24
1 files changed, 8 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index ce1b676..6135f2a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,28 +46,20 @@ install-exec-hook:
$(LN_S) liberasurecode/config_liberasurecode.h)
test: check
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
- ./test/liberasurecode_test
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
- ./test/alg_sig_test
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
- ./test/test_xor_hd_code
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \
- ./test/libec_slap
+ @./test/liberasurecode_test
+ @./test/alg_sig_test
+ @./test/test_xor_hd_code
+ @./test/libec_slap
VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck \
--error-exitcode=1 --leak-check=yes --track-fds=yes \
--malloc-fill=A5 --free-fill=DE --fullpath-after=. --trace-children=yes
valgrind-test: check
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
- ./test/alg_sig_test
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
- ./test/liberasurecode_test
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
- ./test/test_xor_hd_code
- @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) $(VALGRIND_EXEC_COMMAND) \
- ./test/libec_slap
+ @$(VALGRIND_EXEC_COMMAND) ./test/alg_sig_test
+ @$(VALGRIND_EXEC_COMMAND) ./test/liberasurecode_test
+ @$(VALGRIND_EXEC_COMMAND) ./test/test_xor_hd_code
+ @$(VALGRIND_EXEC_COMMAND) ./test/libec_slap
CLEANFILES = cscope.in.out cscope.out cscope.po.out