diff options
| author | Kevin Greenan <kmgreen2@gmail.com> | 2015-06-18 13:26:12 -0700 |
|---|---|---|
| committer | Kevin Greenan <kmgreen2@gmail.com> | 2015-06-18 13:26:12 -0700 |
| commit | c2ffbd488c0c3433f8ca44da5533596335ee4613 (patch) | |
| tree | 4a2f160354ddff636442de0d426274f0c597033b | |
| parent | 1118acd6451d19391e99c3a60282d3e310a670bf (diff) | |
| download | liberasurecode-c2ffbd488c0c3433f8ca44da5533596335ee4613.tar.gz | |
Fix 'make test' to properly run null and installed backend tests.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | 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@ |