From: Jaeyun <jy1210.jung@samsung.com>
Date: Fri, 7 Sep 2018 10:18:18 +0000 (+0900)
Subject: [Test] set lib path
X-Git-Tag: v0.0.2~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=772125940c133cd5b9e283f9c6de3d2b31a6cc4d;p=platform%2Fupstream%2Fnnstreamer.git

[Test] set lib path

1. set lb_lib_path before starting unittest
2. fix typo in cmake

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>
---

diff --git a/gst/tensor_filter/CMakeLists.txt b/gst/tensor_filter/CMakeLists.txt
index 6e44293..7a7d5c6 100644
--- a/gst/tensor_filter/CMakeLists.txt
+++ b/gst/tensor_filter/CMakeLists.txt
@@ -28,15 +28,15 @@ TARGET_LINK_LIBRARIES(${FILTER_LIB} dl ${pkgs_LIBRARIES})
 TARGET_INCLUDE_DIRECTORIES(tensor_filter PUBLIC ${pkgs_INCLUDE_DIRS})
 TARGET_COMPILE_OPTIONS(tensor_filter PUBLIC ${pkgs_CFLAGS_OTHER})
 
-IF(DISABLE_TENSORFLOW_LITE) # NOT AVAILABE
+IF(DISABLE_TENSORFLOW_LITE) # NOT AVAILABLE
   ADD_DEFINITIONS(-DDISABLE_TENSORFLOW_LITE)
 ENDIF(DISABLE_TENSORFLOW_LITE)
 
-IF(DISABLE_TENSORFLOW) # NOT AVAILABE
+IF(DISABLE_TENSORFLOW) # NOT AVAILABLE
   ADD_DEFINITIONS(-DDISABLE_TENSORFLOW)
 ENDIF(DISABLE_TENSORFLOW)
 
-IF(NOT DISABLE_TENSORFLOW_LITE) # AVAILABE
+IF(NOT DISABLE_TENSORFLOW_LITE) # AVAILABLE
   PKG_CHECK_MODULES(TENSORFLOW_LITE REQUIRED tensorflow-lite)
   ADD_LIBRARY(tensor_filter_tflitecore SHARED
     tensor_filter_tensorflow_lite_core.cc
@@ -47,9 +47,9 @@ IF(NOT DISABLE_TENSORFLOW_LITE) # AVAILABE
   TARGET_COMPILE_OPTIONS(tensor_filter_tflitecore PUBLIC ${pkgs_CFLAGS_OTHER})
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wno-sign-compare")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -Wno-sign-compare")
-ENDIF(NOT DISABLE_TENSORFLOW_LITE) # AVAILABE
+ENDIF(NOT DISABLE_TENSORFLOW_LITE) # AVAILABLE
 
-IF(NOT DISABLE_TENSORFLOW) # AVAILABE
+IF(NOT DISABLE_TENSORFLOW) # AVAILABLE
   ADD_LIBRARY(tensor_filter_tfcore SHARED
     tensor_filter_tensorflow_core.cc
     )
@@ -57,7 +57,7 @@ IF(NOT DISABLE_TENSORFLOW) # AVAILABE
   TARGET_LINK_LIBRARIES(tensor_filter_tfcore ${pkgs_LIBRARIES} ${TENSORFLOW_LIBRARIES})
   TARGET_INCLUDE_DIRECTORIES(tensor_filter_tfcore PUBLIC ${pkgs_INCLUDE_DIRS} ${TENSORFLOW_INCLUDE_DIRS})
   TARGET_COMPILE_OPTIONS(tensor_filter_tfcore PUBLIC ${pkgs_CFLAGS_OTHER})
-ENDIF(NOT DISABLE_TENSORFLOW) # AVAILABE
+ENDIF(NOT DISABLE_TENSORFLOW) # AVAILABLE
 
 INSTALL(TARGETS ${FILTER_TARGET}
   RUNTIME DESTINATION ${EXEC_PREFIX}
diff --git a/packaging/nnstreamer.spec b/packaging/nnstreamer.spec
index ca56eb2..0011d93 100644
--- a/packaging/nnstreamer.spec
+++ b/packaging/nnstreamer.spec
@@ -80,20 +80,20 @@ pushd build
 make %{?_smp_mflags}
 popd
 
+%install
+pushd build
+%make_install
+popd
+
 # DO THE TEST!
+export LD_LIBRARY_PATH=%{buildroot}%{gstlibdir}
 
 pushd build
 ./unittest_common
 ./unittest_sink --gst-plugin-path=./gst
 popd
 
-%install
-pushd build
-%make_install
-popd
-
 pushd tests
-export LD_LIBRARY_PATH=%{buildroot}%{gstlibdir}
 ./testAll.sh
 popd