From d330600907750e61889c6b28260df3b1c3765870 Mon Sep 17 00:00:00 2001 From: liuxing Date: Fri, 5 Mar 2021 10:10:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=85=8D=E7=BD=AEci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 文件命名、生成脚本 Log: 任务栏配置ci Change-Id: I0948f79beb3348ee1dccb90bf4b4453d5c1e9c13 --- CMakeLists.txt | 2 +- {unittest => tests}/CMakeLists.txt | 0 tests/test-recoverage.sh | 23 +++++++++++++++++++ .../ut_dockitem.cpp | 0 unittest/main.cpp => tests/ut_main.cpp | 0 .../test_monitor.cpp => tests/ut_monitor.cpp | 0 .../ut_statebutton.cpp | 0 7 files changed, 24 insertions(+), 1 deletion(-) rename {unittest => tests}/CMakeLists.txt (100%) create mode 100755 tests/test-recoverage.sh rename unittest/test_dockitem.cpp => tests/ut_dockitem.cpp (100%) rename unittest/main.cpp => tests/ut_main.cpp (100%) rename unittest/test_monitor.cpp => tests/ut_monitor.cpp (100%) rename unittest/test_statebutton.cpp => tests/ut_statebutton.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c60a23a1..bb1247d98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ file(GLOB SRC_PATH add_subdirectory("frame") add_subdirectory("plugins") -add_subdirectory("unittest") +add_subdirectory("tests") # Install settings if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) diff --git a/unittest/CMakeLists.txt b/tests/CMakeLists.txt similarity index 100% rename from unittest/CMakeLists.txt rename to tests/CMakeLists.txt diff --git a/tests/test-recoverage.sh b/tests/test-recoverage.sh new file mode 100755 index 000000000..8d5e59e33 --- /dev/null +++ b/tests/test-recoverage.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +BUILD_DIR=build +REPORT_DIR=report + +cd ../ +rm -rf $BUILD_DIR +mkdir $BUILD_DIR +cd $BUILD_DIR +cmake ../ +make + +cd tests/ + +lcov -c -i -d ./ -o init.info +./dde_dock_unit_test +lcov -c -d ./ -o cover.info +lcov -a init.info -a cover.info -o total.info +lcov -r total.info "*/tests/*" "*/usr/include*" "*build/src*" -o final.info + +rm -rf ../../tests/$REPORT_DIR +mkdir -p ../../tests/$REPORT_DIR +genhtml -o ../../tests/$REPORT_DIR final.info diff --git a/unittest/test_dockitem.cpp b/tests/ut_dockitem.cpp similarity index 100% rename from unittest/test_dockitem.cpp rename to tests/ut_dockitem.cpp diff --git a/unittest/main.cpp b/tests/ut_main.cpp similarity index 100% rename from unittest/main.cpp rename to tests/ut_main.cpp diff --git a/unittest/test_monitor.cpp b/tests/ut_monitor.cpp similarity index 100% rename from unittest/test_monitor.cpp rename to tests/ut_monitor.cpp diff --git a/unittest/test_statebutton.cpp b/tests/ut_statebutton.cpp similarity index 100% rename from unittest/test_statebutton.cpp rename to tests/ut_statebutton.cpp