From 2bbe5a8213e08185a2266aa8113d001eb49ca372 Mon Sep 17 00:00:00 2001
From: yanghaoran <yanghaoran2@huawei.com>
Date: Fri, 17 Apr 2020 20:15:55 +0800
Subject: [PATCH] correcting errors and warnings from static code check

---
 CMakeLists.txt                                    | 3 +--
 cmake/external_libs/gtest.cmake                   | 4 ++--
 tests/ut/ge/single_op/stream_resource_unittest.cc | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aa8a360..34b657a9 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.14)
 project (GraphEngine[CXX])
 set(CMAKE_CXX_STANDARD 14)
 
-set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY  ${PROJECT_BINARY_DIR})
 set(GE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
 set(GE_PROTO_DIR ${GE_SOURCE_DIR}/src)
 
@@ -71,7 +71,6 @@ elseif(DEFINED ENV{D_LINK_PATH})
     find_library(msprof libmsprof.so ${GE_LIB_PATH})
     find_library(register libregister.so ${GE_LIB_PATH})
     find_library(hccl libhccl.so ${GE_LIB_PATH})
-    find_library(cce libcce.so ${GE_LIB_PATH})
     find_library(resource libresource.so ${GE_LIB_PATH})
 else()
     # Ascend mode
diff --git a/cmake/external_libs/gtest.cmake b/cmake/external_libs/gtest.cmake
index 05f07984..e6d1ab1d 100644
--- a/cmake/external_libs/gtest.cmake
+++ b/cmake/external_libs/gtest.cmake
@@ -1,5 +1,5 @@
-set(ge_gtest_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2")
-set(ge_gtest_CFLAGS "-D_FORTIFY_SOURCE=2 -O2")
+set(ge_gtest_CXXFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
+set(ge_gtest_CFLAGS "-D_FORTIFY_SOURCE=2 -O2 -fstack-protector-all -Wl,-z,relro,-z,now,-z,noexecstack")
 
 graphengine_add_pkg(ge_gtest
         VER 1.8.0
diff --git a/tests/ut/ge/single_op/stream_resource_unittest.cc b/tests/ut/ge/single_op/stream_resource_unittest.cc
index 88ec25c2..6f9e44a6 100644
--- a/tests/ut/ge/single_op/stream_resource_unittest.cc
+++ b/tests/ut/ge/single_op/stream_resource_unittest.cc
@@ -74,4 +74,8 @@ TEST_F(UtestStreamResource, test_do_malloc_memory) {
   StreamResource::DoMallocMemory(101, max_allocated, allocated);
   ASSERT_EQ(allocated.size(), 2);
   ASSERT_EQ(max_allocated, 101);
+
+  for (auto res : allocated) {
+      rtFree(res);
+  }
 }