Skip to content

Commit

Permalink
Fix building with LD_LIBRARY_PATH set
Browse files Browse the repository at this point in the history
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 19442df
where Kota removed evals, but forgot to remove prepending of same env
variables.

Change-Id: Ib7a1d6b839d4a207ee0471b55233e1ce5d958705
  • Loading branch information
onovy committed Oct 1, 2018
1 parent 7df6c25 commit b046ff7
Showing 1 changed file with 8 additions and 16 deletions.
24 changes: 8 additions & 16 deletions Makefile.am
Expand Up @@ -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

Expand Down

0 comments on commit b046ff7

Please sign in to comment.