From 8f45b7683b69873ce288b7e717132f1fef503acf Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 3 Jul 2020 14:45:51 +0200 Subject: [PATCH] Test: coverage only for library and simulator. --- DRAMSys/CMakeLists.txt | 14 +++++++------- DRAMSys/gem5/CMakeLists.txt | 3 ++- DRAMSys/library/CMakeLists.txt | 8 +++++--- DRAMSys/simulator/CMakeLists.txt | 7 +++++-- DRAMSys/traceAnalyzer/CMakeLists.txt | 4 +++- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/DRAMSys/CMakeLists.txt b/DRAMSys/CMakeLists.txt index fd204fe8..3bf1b56e 100644 --- a/DRAMSys/CMakeLists.txt +++ b/DRAMSys/CMakeLists.txt @@ -41,13 +41,13 @@ project(DRAMSys) set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version") set(DCMAKE_SH "CMAKE_SH-NOTFOUND" CACHE STRING "Ignore sh.exe error on Windows") -if(DEFINED ENV{COVERAGE} AND $ENV{COVERAGE} STREQUAL "true") - message("---- Coverage check enabled") - set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage") - set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}") -endif() +# if(DEFINED ENV{COVERAGE} AND $ENV{COVERAGE} STREQUAL "true") + # message("---- Coverage check enabled") + # set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage") + # set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov") + # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") + # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}") +# endif() # Add DRAMSysLibrary: add_subdirectory(library) diff --git a/DRAMSys/gem5/CMakeLists.txt b/DRAMSys/gem5/CMakeLists.txt index 6485e4f1..375611ee 100644 --- a/DRAMSys/gem5/CMakeLists.txt +++ b/DRAMSys/gem5/CMakeLists.txt @@ -28,7 +28,8 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Author: Lukas Steiner +# Authors: +# Lukas Steiner cmake_minimum_required(VERSION 3.10) diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt index 27982e2a..34557e70 100644 --- a/DRAMSys/library/CMakeLists.txt +++ b/DRAMSys/library/CMakeLists.txt @@ -40,7 +40,8 @@ project(DRAMSysLibrary) # Configuration: set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version") set(DCMAKE_SH="CMAKE_SH-NOTFOUND") -if(DEFINED ENV{COVERAGE}) + +if(DEFINED ENV{COVERAGE} AND $ENV{COVERAGE} STREQUAL "true") set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage") set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") @@ -67,7 +68,8 @@ else() message("-- Building with SystemC submodule") endif() -if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/simulation/DRAMSysRecordable.cpp) +if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/common/third_party/sqlite-amalgamation) + message("---- Database recording available") # Add sqlite3 Dependency: set(BUILD_ENABLE_RTREE ON CACHE BOOL "Enable R-Tree Feature") set(BUILD_ENABLE_RTREE ON) @@ -302,7 +304,7 @@ if(DEFINED ENV{LIBTHREED_ICE_HOME}) ) endif() -if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/simulation/DRAMSysRecordable.cpp) +if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/src/common/third_party/sqlite-amalgamation) target_include_directories(DRAMSysLibrary PRIVATE src/common/third_party/sqlite-amalgamation/ ) diff --git a/DRAMSys/simulator/CMakeLists.txt b/DRAMSys/simulator/CMakeLists.txt index 1fba5b3f..07acc38f 100644 --- a/DRAMSys/simulator/CMakeLists.txt +++ b/DRAMSys/simulator/CMakeLists.txt @@ -28,7 +28,9 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Author: Matthias Jung +# Authors: +# Matthias Jung +# Lukas Steiner cmake_minimum_required(VERSION 3.10) @@ -38,7 +40,8 @@ project(DRAMSysSimulator) # Configuration: set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version") set(DCMAKE_SH="CMAKE_SH-NOTFOUND") -if(DEFINED ENV{COVERAGE}) + +if(DEFINED ENV{COVERAGE} AND $ENV{COVERAGE} STREQUAL "true") set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage") set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}") diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt index fd6d6240..fc9ba9dc 100644 --- a/DRAMSys/traceAnalyzer/CMakeLists.txt +++ b/DRAMSys/traceAnalyzer/CMakeLists.txt @@ -28,7 +28,9 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# Author: Matthias Jung +# Authors: +# Matthias Jung +# Lukas Steiner cmake_minimum_required(VERSION 3.12)