From: E. Scott Daniels Date: Tue, 11 Jun 2019 17:35:39 +0000 (-0400) Subject: fix(test): Remove unit_test dependency on install X-Git-Tag: 1.0.36~10 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=69e742d1b1c2c29c8cc2a8f54df2dbe91a7f08aa;p=ric-plt%2Flib%2Frmr.git fix(test): Remove unit_test dependency on install The unit tests were accidentally dependent on the nanomsg and nng libraries being installed on the system. Change references them from the build envionment as intended. Signed-off-by: E. Scott Daniels Change-Id: I3ebee18a796e535eb20d39e06be7f6def7a603e5 --- diff --git a/test/Makefile b/test/Makefile index db4655a..40d9fc1 100644 --- a/test/Makefile +++ b/test/Makefile @@ -22,8 +22,7 @@ CC = gcc coverage_opts = -ftest-coverage -fprofile-arcs -#libs = ../build/librmr_nng.a -L ../build/lib -lnng -lpthread -lm -libs = -L ../build/lib -lnng -lpthread -lm +libs = -lnng -lpthread -lm ipaths = -I ../src/rmr/common/src/ -I ../src/rmr/common/include -I ../src/rmr/nng/include/ -I ../src/rmr/nng/src/ -I ../src/rmr/nanomsg/include/ -I ../src/rmr/nanomsg/src/ #sa_tests = sa_tools_test.o diff --git a/test/unit_test.ksh b/test/unit_test.ksh index c94d4cd..7b5d6a8 100755 --- a/test/unit_test.ksh +++ b/test/unit_test.ksh @@ -320,6 +320,8 @@ else fi fi +export LIBRARY_PATH=$LD_LIBRARY_PATH + export C_INCLUDE_PATH="../src/rmr/common/include:$C_INCLUDE_PATH" module_cov_target=80