Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,4 @@ obj-x86_64-linux-gnu/
build-ut*/

# Python bytecode
deepin-devicemanager-server/tests/__pycache__/
__pycache__/
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

# tests
Files: deepin-devicemanager/tests/* deepin-devicemanager-server/tests/*
Files: test/*
Copyright: UnionTech Software Technology Co., Ltd.
License: GPL-3.0-or-later

Expand Down
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

cmake_minimum_required(VERSION 3.7)
project(deepin-devicemanager C CXX)

Expand Down Expand Up @@ -40,6 +44,12 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,relro -Wl,-z,now")
add_subdirectory(${CMAKE_SOURCE_DIR}/deepin-devicemanager)
add_subdirectory(${CMAKE_SOURCE_DIR}/deepin-devicemanager-server)

# 单元测试(已从各子项目 tests/ 外移至顶层 test/,覆盖率构建时启用)
if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
add_subdirectory(test/deepin-devicemanager)
add_subdirectory(test/deepin-devicemanager-server)
endif()

#代码覆盖率开关
if(CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -fprofile-arcs -ftest-coverage")
Expand Down
4 changes: 1 addition & 3 deletions deepin-devicemanager-server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,4 @@ add_subdirectory(deepin-devicecontrol)
add_subdirectory(customgpuinfo)

#TEST--------------------------------------------------
if (CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
add_subdirectory(./tests)
endif()
# 注:单元测试已外移至顶层 test/deepin-devicemanager-server/,由根 CMakeLists 统一挂载
8 changes: 6 additions & 2 deletions deepin-devicemanager-server/cmake-lcov-test.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

utdir=build-ut
rm -r $utdir
rm -r ../$utdir
Expand All @@ -13,13 +17,13 @@ app_name=deepin-devicemanager-server-test

mkdir -p report

./deepin-devicemanager-server/tests/$app_name --gtest_output=xml:./report/report.xml
./test/deepin-devicemanager-server/$app_name --gtest_output=xml:./report/report.xml

lcov -d $workdir -c -o ./report/coverage.info

lcov --extract ./report/coverage.info '*/src/*' -o ./report/coverage.info

lcov --remove ./report/coverage.info '*/tests/*' '*/3rdparty/*' -o ./report/coverage.info
lcov --remove ./report/coverage.info '*/test/*' '*/3rdparty/*' -o ./report/coverage.info

genhtml -o ./report ./report/coverage.info

Expand Down
287 changes: 0 additions & 287 deletions deepin-devicemanager-server/tests/run-ut.sh

This file was deleted.

5 changes: 1 addition & 4 deletions deepin-devicemanager/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,4 @@ else()
message(FATAL_ERROR "Unsupported QT_VERSION_MAJOR: ${QT_VERSION_MAJOR}")
endif()

# Test--------deepin-devicemanager
if (CMAKE_COVERAGE_ARG STREQUAL "CMAKE_COVERAGE_ARG_ON")
add_subdirectory(./tests)
endif()
# 注:单元测试已外移至顶层 test/deepin-devicemanager/,由根 CMakeLists 统一挂载
8 changes: 6 additions & 2 deletions deepin-devicemanager/cmake-lcov-test.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# SPDX-FileCopyrightText: 2026 UnionTech Software Technology Co., Ltd.
#
# SPDX-License-Identifier: GPL-3.0-or-later

utdir=build-ut
rm -r $utdir
rm -r ../$utdir
Expand All @@ -13,13 +17,13 @@ app_name=deepin-devicemanager-test

mkdir -p report

./deepin-devicemanager/tests/$app_name --gtest_output=xml:./report/report.xml
./test/deepin-devicemanager/$app_name --gtest_output=xml:./report/report.xml

lcov -d $workdir -c -o ./report/coverage.info

lcov --extract ./report/coverage.info '*/src/*' -o ./report/coverage.info

lcov --remove ./report/coverage.info '*/tests/*' '*/3rdparty/*' -o ./report/coverage.info
lcov --remove ./report/coverage.info '*/test/*' '*/3rdparty/*' -o ./report/coverage.info

genhtml -o ./report ./report/coverage.info

Expand Down
Loading
Loading