From e4d755609065291ee5e1a6ada92dd3ea858a9ca5 Mon Sep 17 00:00:00 2001
From: FanPengCheng <fanpengcheng@uniontech.com>
Date: Mon, 24 May 2021 17:32:05 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B7=BB=E5=8A=A0=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E6=B3=84=E9=9C=B2=E6=A3=80=E6=B5=8B=E7=9A=84=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为后面CI自动化做准备，内存检测编译参数仅在Release模式下生效

Log:
Change-Id: Id03a9781ba55578645942e597fa7b0425dd419a7
---
 frame/item/components/appdragwidget.cpp | 1 +
 frame/item/components/appsnapshot.cpp   | 1 +
 tests/CMakeLists.txt                    | 5 +++++
 tests/main.cpp                          | 8 +++++++-
 tests/test-recoverage.sh                | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/frame/item/components/appdragwidget.cpp b/frame/item/components/appdragwidget.cpp
index 6ce68dc37..67ef8c56a 100644
--- a/frame/item/components/appdragwidget.cpp
+++ b/frame/item/components/appdragwidget.cpp
@@ -69,6 +69,7 @@ AppDragWidget::AppDragWidget(QWidget *parent)
     , m_animOpacity(new QPropertyAnimation(m_object, "opacity", this))
     , m_animGroup(new QParallelAnimationGroup(this))
     , m_goBackAnim(new QPropertyAnimation(this, "pos", this))
+    , m_dockPosition(Dock::Position::Bottom)
     , m_removeTips(new TipsWidget(this))
     , m_popupWindow(nullptr)
     , m_distanceMultiple(Utils::SettingValue("com.deepin.dde.dock.distancemultiple", "/com/deepin/dde/dock/distancemultiple/", "distance-multiple", 1.5).toDouble())
diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp
index f61be495e..b5cd43cd2 100644
--- a/frame/item/components/appsnapshot.cpp
+++ b/frame/item/components/appsnapshot.cpp
@@ -57,6 +57,7 @@ using namespace Dock;
 AppSnapshot::AppSnapshot(const WId wid, QWidget *parent)
     : QWidget(parent)
     , m_wid(wid)
+    , m_closeAble(false)
     , m_isWidowHidden(false)
     , m_title(new TipsWidget(this))
     , m_waitLeaveTimer(new QTimer(this))
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 75928c0ea..a1682058a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -11,6 +11,11 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../widgets/*.h" "../widgets/*.cpp")
 # 用于测试覆盖率的编译条件
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov")
 
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=address -O2")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=address -O2")
+endif()
+
 # 查找gmock的cmake文件
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/tests/cmake/modules)
 
diff --git a/tests/main.cpp b/tests/main.cpp
index 616839b8b..e51b3d8a8 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -19,6 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <gtest/gtest.h>
+#ifdef QT_DEBUG
+#include <sanitizer/asan_interface.h>
+#endif
 
 #include "dockapplication.h"
 
@@ -29,7 +32,7 @@
 
 int main(int argc, char **argv)
 {
-    // gerrit编译时没有显示器，需要指定环境变量,本地Debug模式编译时不要设置这个宏，导致获取不到显示器相关信息
+        // gerrit编译时没有显示器，需要指定环境变量,本地Debug模式编译时不要设置这个宏，导致获取不到显示器相关信息
 #ifndef QT_DEBUG
     qputenv("QT_QPA_PLATFORM", "offscreen");
 #endif
@@ -40,5 +43,8 @@ int main(int argc, char **argv)
 
     ::testing::InitGoogleTest(&argc, argv);
 
+#ifdef QT_DEBUG
+    __sanitizer_set_report_path("asan.log");
+#endif
     return RUN_ALL_TESTS();
 }
diff --git a/tests/test-recoverage.sh b/tests/test-recoverage.sh
index da8632f80..67d5b3d39 100755
--- a/tests/test-recoverage.sh
+++ b/tests/test-recoverage.sh
@@ -7,6 +7,9 @@ cd ../
 rm -rf $BUILD_DIR
 mkdir $BUILD_DIR
 cd $BUILD_DIR
+
+cmake -DCMAKE_BUILD_TYPE=Debug ..
+
 cmake ../
 make -j 16
 
@@ -20,3 +23,5 @@ lcov -r code.info '*/dbus/*' '*/xcb/*' -o final.info
 rm -rf ../../tests/$REPORT_DIR
 mkdir -p ../../tests/$REPORT_DIR
 genhtml -o ../../tests/$REPORT_DIR final.info
+
+mv asan.log* asan_dde-dock.log