Fix potential nil ptr seg fault and CI test issue
This change corrects two problems that the "dockerless"
CI build process was encountering:
- Include and link paths set in the CMake config
were not always honoured by the application test
scripts
- Building packges to install in the test environment
as a non-root user was causing non-standard install
prefixes to be added to the packages.
This change also corrects a typo in the NNG module which
potentially could have allowed a nil pointer to be
dereferenced. This bug was discovered while makeing the
changes for the CI jobs.
Issue-ID: RIC-303
Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I30150950dd186e72f8c822ec3fbe5b07369cb4ce
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0d6a9e..076448e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@
set( major_version "3" ) # should be automatically populated from git tag later, but until CI process sets a tag we use this
set( minor_version "6" )
-set( patch_level "3" )
+set( patch_level "4" )
set( install_root "${CMAKE_INSTALL_PREFIX}" )
set( install_inc "include/rmr" )
@@ -297,9 +297,10 @@
# ------------- testing -------------------------------------------------------
enable_testing()
+# cmake cannot set env vars, so we have to passed desired vars on the wrapper command
add_test(
NAME drive_unit_tests
- COMMAND bash ../test/unit_test.ksh -q
+ COMMAND bash ../test/run_unit_tests.sh CMBUILD=${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ../test
)
@@ -307,7 +308,7 @@
# a dummy script in ./test that does the obvious thing.
add_test(
NAME drive_app
- COMMAND bash ./run_app_tests LD_LIBRARY_PATH=${install_root}/lib C_INCLUDE_PATH=${install_root}/include
+ COMMAND bash ./run_app_tests.sh LD_LIBRARY_PATH=${install_root}/lib C_INCLUDE_PATH=${install_root}/include CMBUILD=${CMAKE_CURRENT_BINARY_DIR}
WORKING_DIRECTORY ../test
)
@@ -343,7 +344,7 @@
unset( DEV_PKG CACHE ) # prevent from being a hidden setting if user redoes things
# install any nano/nng libraries in to the deb as well, but ONLY if asked for on the 'cmake ..' command
-# (sure would be nice if FILEs allowed for globbing; sadlyy it does not.)
+# (sure would be nice if FILEs allowed for globbing; sadly it does not.)
#
if( PACK_EXTERNALS )
message( "+++ including nano and nng libraries in the deb" )