Code Review
/
ric-plt
/
lib
/
rmr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix potential nil ptr seg fault and CI test issue
[ric-plt/lib/rmr.git]
/
test
/
app_test
/
Makefile
diff --git
a/test/app_test/Makefile
b/test/app_test/Makefile
index
fe4cd33
..
edff57e
100644
(file)
--- a/
test/app_test/Makefile
+++ b/
test/app_test/Makefile
@@
-36,10
+36,11
@@
SHELL ?= /bin/ksh
ex_cflags = $(shell echo $$EX_CFLAGS )
build_path ?= ../../.build
ex_cflags = $(shell echo $$EX_CFLAGS )
build_path ?= ../../.build
-header_path := $(shell find $(build_path) -name 'rmr.h' |head -1 | sed 's!/rmr/.*!!' )
+header_path := $(shell find $(build_path) -name 'rmr.h'
2>/dev/null
|head -1 | sed 's!/rmr/.*!!' )
-C_INCLUDE_PATH := $(header_path)
-LD_LIBRARY_PATH=$(build_path):$(build_path)/lib
+# use from environment if there so as to allow build to reference installed base
+C_INCLUDE_PATH ?= $(header_path)
+LD_LIBRARY_PATH ?= $(build_path):$(build_path)/lib
LIBRARY_PATH = $(LD_LIBRARY_PATH)
# These programmes are designed to test some basic application level functions
LIBRARY_PATH = $(LD_LIBRARY_PATH)
# These programmes are designed to test some basic application level functions
@@
-47,7
+48,7
@@
LIBRARY_PATH = $(LD_LIBRARY_PATH)
.PHONY: all all_si
.PHONY: all all_si
-all: sender receiver caller mt_receiver v_sender ex_rts_receiver
+all: sender receiver caller mt_receiver v_sender ex_rts_receiver
sender_si receiver_si
all_si: sender_si receiver_si
all_si: sender_si receiver_si