From a7d6a8345fd82a9c14356d99a104ab23e9011035 Mon Sep 17 00:00:00 2001 From: Jaehyun Kim Date: Fri, 27 Apr 2018 18:16:15 +0900 Subject: [PATCH] Separate HAL TC code into a separate package Change-Id: Ic7d26b839fa950c4c4cfd79d49287a24f34b61e7 Signed-off-by: Jaehyun Kim --- CMakeLists.txt | 4 +--- packaging/net-config.spec | 26 +++++++++++++--------- .../{gtest_hal_hostap.cpp => hostap_hal_tc.cpp} | 0 ..._hal_wifi_direct.cpp => wifi_direct_hal_tc.cpp} | 0 unittest/{gtest_hal_wifi.cpp => wifi_hal_tc.cpp} | 0 5 files changed, 17 insertions(+), 13 deletions(-) rename unittest/{gtest_hal_hostap.cpp => hostap_hal_tc.cpp} (100%) rename unittest/{gtest_hal_wifi_direct.cpp => wifi_direct_hal_tc.cpp} (100%) rename unittest/{gtest_hal_wifi.cpp => wifi_hal_tc.cpp} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7d8fa8..6c372e7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,6 +130,4 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATIO ADD_SUBDIRECTORY(plugin/headed) ADD_SUBDIRECTORY(plugin/telephony) -IF(BUILD_GTESTS) - ADD_SUBDIRECTORY(unittest) -ENDIF(BUILD_GTESTS) +ADD_SUBDIRECTORY(unittest) diff --git a/packaging/net-config.spec b/packaging/net-config.spec index 749aa5e..f162aa7 100755 --- a/packaging/net-config.spec +++ b/packaging/net-config.spec @@ -1,6 +1,6 @@ Name: net-config Summary: TIZEN Network Configuration service -Version: 1.1.131 +Version: 1.1.132 Release: 3 Group: System/Network License: Apache-2.0 @@ -16,12 +16,6 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(key-manager) BuildRequires: pkgconfig(libnl-2.0) -%if 0%{?gtests:1} -BuildRequires: pkgconfig(gmock) -BuildRequires: pkgconfig(capi-network-wifi-manager) -BuildRequires: pkgconfig(capi-network-wifi-direct) -BuildRequires: pkgconfig(capi-network-softap) -%endif Requires: vconf Requires: connman Requires: systemd @@ -69,6 +63,16 @@ Requires: %{name} = %{version}-%{release} %description plugin-telephony TIZEN Network Configuration service extension for telephony FW. +%package hal-utest +Summary: net-config extension for HAL test +BuildRequires: pkgconfig(gmock) +BuildRequires: pkgconfig(capi-network-wifi-manager) +BuildRequires: pkgconfig(capi-network-wifi-direct) +BuildRequires: pkgconfig(capi-network-softap) +Requires: %{name} = %{version}-%{release} +%description hal-utest +TIZEN Network Configuration service extension for HAL test. + %prep %setup -q @@ -205,9 +209,6 @@ ln -sf %{_unitdir}/net-config.service %{_sysconfdir}/systemd/default-extra-depen %license LICENSE %attr(500,root,root) /opt/etc/dump.d/module.d/network_dump.sh %attr(500,network_fw,network_fw) /opt/var/lib/net-config/network_dump.sh -%if 0%{?gtests:1} -%{_bindir}/gtest* -%endif #### tv profile #### %post profile_tv @@ -243,3 +244,8 @@ mv net-config.wearable net-config %files plugin-telephony %manifest net-config.manifest %attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-telephony.so + +%files hal-utest +%manifest net-config.manifest +%{_bindir}/*hal_tc + diff --git a/unittest/gtest_hal_hostap.cpp b/unittest/hostap_hal_tc.cpp similarity index 100% rename from unittest/gtest_hal_hostap.cpp rename to unittest/hostap_hal_tc.cpp diff --git a/unittest/gtest_hal_wifi_direct.cpp b/unittest/wifi_direct_hal_tc.cpp similarity index 100% rename from unittest/gtest_hal_wifi_direct.cpp rename to unittest/wifi_direct_hal_tc.cpp diff --git a/unittest/gtest_hal_wifi.cpp b/unittest/wifi_hal_tc.cpp similarity index 100% rename from unittest/gtest_hal_wifi.cpp rename to unittest/wifi_hal_tc.cpp -- 2.7.4