From 85c5bf71db97dc7c4f15bd170b17c85e53ee0f24 Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Wed, 29 May 2019 13:38:43 +0000 Subject: [PATCH] fix(test): Correct unit test bugs Return in mbuf_api_test.c was missing causing occasional report of failed test when all tests passed. unit_test.ksh wasn't properly searching for build directory on systems which support lib64 naming conventions. Change-Id: Idc208ef796c8dabf70c039e38fafab2a34db4df9 Signed-off-by: E. Scott Daniels --- test/mbuf_api_test.c | 2 ++ test/unit_test.ksh | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/mbuf_api_test.c b/test/mbuf_api_test.c index fdc221a..796888f 100644 --- a/test/mbuf_api_test.c +++ b/test/mbuf_api_test.c @@ -102,4 +102,6 @@ int main( ) { } else { fprintf( stderr, " mbuf_api tests pass\n" ); } + + return errors; } diff --git a/test/unit_test.ksh b/test/unit_test.ksh index 559f7d3..c94d4cd 100755 --- a/test/unit_test.ksh +++ b/test/unit_test.ksh @@ -305,17 +305,17 @@ function mk_xml { # ----------------------------------------------------------------------------------------------------------------- # we assume that the project has been built in the ../[.]build directory -if [[ -d ../build/lib ]] +if [[ -d ../build ]] then - export LD_LIBRARY_PATH=../build/lib + export LD_LIBRARY_PATH=../build/lib:../build/lib64 else - if [[ -d ../.build/lib ]] + if [[ -d ../.build ]] then - export LD_LIBRARY_PATH=../.build/lib + export LD_LIBRARY_PATH=../.build/lib:../.build/lib64 export C_INCLUDE_PATH=../.build/include else - echo "[WARN] cannot find ../[.]build/lib; things might not work" + echo "[WARN] cannot find build directory (tried ../build and ../.build); things might not work" echo "" fi fi -- 2.16.6