From c2ffbd488c0c3433f8ca44da5533596335ee4613 Mon Sep 17 00:00:00 2001 From: Kevin Greenan Date: Thu, 18 Jun 2015 13:26:12 -0700 Subject: Fix 'make test' to properly run null and installed backend tests. --- Makefile.am | 6 +++--- src/Makefile.am | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 21a5f0f..3b366a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,9 +33,9 @@ thisinclude_HEADERS = \ test: check $(eval SONAMES := $(shell find $(abs_top_builddir) -name '*.so')) $(eval SODIRS := $(dir $(SONAMES))) - $(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(subst / ,/:,$(SODIRS))") - $(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(subst / ,/:,$(SODIRS))") - $(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH="$(subst / ,/:,$(SODIRS))") + $(eval LD_LIBRARY_PATH := LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))") + $(eval DYLD_LIBRARY_PATH := DYLD_LIBRARY_PATH="$(DYLD_LIBRARY_PATH):$(subst / ,/:,$(SODIRS))") + $(eval DYLD_FALLBACK_LIBRARY_PATH := DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH):"$(subst / ,/:,$(SODIRS))") @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \ ./test/liberasurecode_test @$(LD_LIBRARY_PATH) $(DYLD_LIBRARY_PATH) $(DYLD_FALLBACK_LIBRARY_PATH) \ diff --git a/src/Makefile.am b/src/Makefile.am index 63b2542..ee46250 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ liberasurecodeinclude_HEADERS = \ liberasurecode_la_CPPFLAGS = -Werror @GCOV_FLAGS@ liberasurecode_la_LIBADD = \ + builtin/null_code/libnullcode.la -lpthread -lm @GCOV_LDFLAGS@ \ builtin/xor_codes/libXorcode.la -lpthread -lm @GCOV_LDFLAGS@ \ builtin/rs_vand/liberasurecode_rsvand.la -lpthread -lm @GCOV_LDFLAGS@ -- cgit v1.2.1