From b9e906c74a4b67f1ec52bb59f5724521d0ac1d8e Mon Sep 17 00:00:00 2001 From: Ilho Kim Date: Thu, 9 Jun 2022 16:38:27 +0900 Subject: [PATCH] Block the build of unittest when building with asan Change-Id: Ic22ed90b221be8993e365ddb600a3dd7ead947e0 Signed-off-by: Ilho Kim --- CMakeLists.txt | 10 +++++++--- packaging/pkgmgr-info.spec | 11 ++++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c27521..f3df693 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,15 +83,19 @@ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") SET(EXTRA_LINKER_FLAGS "-Wl,--as-needed") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EXTRA_LINKER_FLAGS}") -ENABLE_TESTING() -SET(TARGET_PKGMGR_INFO_UNIT_TEST "pkgmgr-info-unit-test") +IF(ASAN_ENABLED) + ENABLE_TESTING() + SET(TARGET_PKGMGR_INFO_UNIT_TEST "pkgmgr-info-unit-test") +ENDIF(ASAN_ENABLED) ################## ## build comm libraries ADD_SUBDIRECTORY(parser) ADD_SUBDIRECTORY(tool) ADD_SUBDIRECTORY(plugin_list) ADD_SUBDIRECTORY(src) -ADD_SUBDIRECTORY(test) +IF(ASAN_ENABLED) + ADD_SUBDIRECTORY(test) +ENDIF(ASAN_ENABLED) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/pkgmgr-info.pc.in ${CMAKE_BINARY_DIR}/pkgmgr-info.pc @ONLY) CONFIGURE_FILE(pkg_db_version.txt.in pkg_db_version.txt @ONLY) diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec index 7e35307..3a94823 100755 --- a/packaging/pkgmgr-info.spec +++ b/packaging/pkgmgr-info.spec @@ -72,11 +72,13 @@ Requires: %{name}-common = %{version}-%{release} %description common-devel Dev package for libpkgmgr_common +%if 0%{?asan_enabled} %package unittests Summary: %{name} unittests binary %description unittests unittest binary +%endif %prep %setup -q @@ -91,7 +93,10 @@ export LDFLAGS+=" -lgcov" %endif MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DUNITDIR=%{_unitdir} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DUNITDIR=%{_unitdir} \ +%if 0%{?asan_enabled} + -DASAN_ENABLED=TRUE \ +%endif %__make %{?jobs:-j%jobs} @@ -113,6 +118,7 @@ mkdir -p "$gcno_obj_dir" find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif +%if 0%{?asan_enabled} cat << EOF > run-unittest.sh #!/bin/sh @@ -140,6 +146,7 @@ EOF mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name} install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name}/ +%endif mkdir -p %{buildroot}%{_unitdir}/basic.target.wants ln -sf ../pkg-db-recovery.service %{buildroot}%{_unitdir}/basic.target.wants/pkg-db-recovery.service @@ -226,6 +233,8 @@ Packager Manager information api gcov objects %{_datadir}/gcov/obj/* %endif +%if 0%{?asan_enabled} %files unittests %{_bindir}/pkgmgr-info-unit-test %{_bindir}/tizen-unittests/%{name}/run-unittest.sh +%endif -- 2.7.4