From 5df7af9dcc71a3d27ef87e44abe681be7beb27c1 Mon Sep 17 00:00:00 2001 From: Jaeyun Date: Tue, 28 Jun 2022 15:56:44 +0900 Subject: [PATCH] [Test] temporal block Temporally block the unittest, we should enable this after migrating nnstreamer-edge library. Signed-off-by: Jaeyun --- packaging/nnstreamer-edge.spec | 38 +++++++++++++++++----------------- tests/CMakeLists.txt | 5 +---- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/packaging/nnstreamer-edge.spec b/packaging/nnstreamer-edge.spec index 5b2e1f8..183c3b0 100644 --- a/packaging/nnstreamer-edge.spec +++ b/packaging/nnstreamer-edge.spec @@ -14,7 +14,7 @@ BuildRequires: cmake BuildRequires: pkgconfig(paho-mqtt-c) # TODO remove glib BuildRequires: glib2-devel -%if 0%{?sensor_test} +%if 0%{?unit_test} BuildRequires: gtest-devel %endif @@ -38,19 +38,17 @@ Summary: communication library for edge sensor It is a communication library for edge sensor devices. This library supports publishing the sensor data to the GStreamer pipeline without GStreamer / Glib dependency. -%package sensor-test -Summary: test program for nnstreamer-edge-sensor library -%description sensor-test -It is a test program for nnstreamer-edge-sensor library. -It read the jpeg data and publishes it as "TestTopic" topic name 10 times. -If data is successfully received, then the image is shown on the server-side. - %package sensor-devel Summary: development package for nnstreamer-edge-sensor Requires: nnstreamer-edge = %{version}-%{release} %description sensor-devel It is a development package for nnstreamer-edge-sensor. +%package unittest +Summary: test program for nnstreamer-edge library +%description unittest +It is a test program for nnstreamer-edge library. + %if 0%{?testcoverage} %package unittest-coverage Summary: Unittest coverage result for nnstreamer-edge @@ -58,9 +56,11 @@ Summary: Unittest coverage result for nnstreamer-edge HTML pages of lcov results of nnstreamer-edge generated during rpm build %endif -%define enable_sensor_test -DENABLE_TEST=OFF -%if 0%{?sensor_test} -%define enable_sensor_test -DENABLE_TEST=ON +# TODO FIXME enable unittest after migration +%if 0%{?unit_test} +%define enable_unittest -DENABLE_TEST=OFF +%else +%define enable_unittest -DENABLE_TEST=OFF %endif %prep @@ -86,7 +86,7 @@ mkdir -p build pushd build %cmake .. \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DVERSION=%{version} %{enable_sensor_test} + -DVERSION=%{version} %{enable_unittest} make %{?jobs:-j%jobs} popd @@ -97,7 +97,7 @@ pushd build %make_install popd -%if 0%{?sensor_test} +%if 0%{?unit_test} LD_LIBRARY_PATH=./src bash %{test_script} ./tests/unittest_edge_sensor %endif @@ -143,17 +143,17 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/libedge-sensor.so* -%if 0%{?sensor_test} -%files sensor-test +%files sensor-devel +%{_includedir}/edge_sensor.h +%{_libdir}/pkgconfig/nnstreamer-edge-sensor.pc + +%if 0%{?unit_test} +%files unittest %manifest nnstreamer-edge.manifest %defattr(-,root,root,-) %{_bindir}/test_edge_sensor %endif -%files sensor-devel -%{_includedir}/edge_sensor.h -%{_libdir}/pkgconfig/nnstreamer-edge-sensor.pc - %if 0%{?testcoverage} %files unittest-coverage %{_datadir}/nnstreamer-edge/unittest/* diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5695c53..7fbb2bf 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -2,12 +2,9 @@ ADD_EXECUTABLE(test_edge_sensor test_edge_sensor.c) TARGET_INCLUDE_DIRECTORIES(test_edge_sensor PRIVATE ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS} ${INCLUDE_DIR}) TARGET_LINK_LIBRARIES(test_edge_sensor -L${PROJECT_BINARY_DIR}/src edge-sensor) - INSTALL (TARGETS test_edge_sensor DESTINATION ${BIN_INSTALL_DIR}) -# GoogleTest requires at least C++11 and match the nnstreamer cpp version. -SET(CMAKE_CXX_STANDARD 14) - +# Unittest ADD_EXECUTABLE(unittest_edge_sensor unittest_edge_sensor.cc) TARGET_INCLUDE_DIRECTORIES(unittest_edge_sensor PRIVATE ${INCLUDE_DIR}) TARGET_LINK_LIBRARIES(unittest_edge_sensor ${TEST_REQUIRE_PKGS_LDFLAGS} edge-sensor) -- 2.34.1