File tree Expand file tree Collapse file tree 3 files changed +7
-51
lines changed Expand file tree Collapse file tree 3 files changed +7
-51
lines changed Original file line number Diff line number Diff line change @@ -101,18 +101,6 @@ matrix:
101
101
compiler : gcc
102
102
103
103
# OSX clang
104
- # - os: osx
105
- # osx_image: xcode9.2
106
- # env: BUILD_TYPE=Debug USE_VALGRIND=true CMAKE_GENERATOR="Xcode"
107
- # addons:
108
- # homebrew:
109
- # update: true
110
- # packages:
111
- # - ccache
112
- # - cmake
113
- # - valgrind
114
- # compiler: clang
115
-
116
104
- os : osx
117
105
osx_image : xcode8.3
118
106
env : BUILD_TYPE=Release CMAKE_GENERATOR="Xcode"
Original file line number Diff line number Diff line change @@ -20,6 +20,12 @@ target_include_directories(Catch2 INTERFACE
20
20
option (GFX_TIMSORT_USE_VALGRIND "Whether to run the tests with Valgrind" OFF )
21
21
set (GFX_TIMSORT_SANITIZE "" CACHE STRING "Comma-separated list of options to pass to -fsanitize" )
22
22
23
+ # Configure Valgrind
24
+ if (${GFX_TIMSORT_USE_VALGRIND} )
25
+ find_program (MEMORYCHECK_COMMAND valgrind )
26
+ set (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --track-origins=yes --error-exitcode=1 --show-reachable=no" )
27
+ endif ()
28
+
23
29
macro (configure_tests target )
24
30
# Add required dependencies to tests
25
31
target_link_libraries (${target} PRIVATE
@@ -80,23 +86,14 @@ add_executable(cxx_98_tests
80
86
configure_tests (cxx_98_tests )
81
87
target_compile_features (cxx_98_tests PRIVATE cxx_std_98 )
82
88
83
- # Tests that require C++11 support to run
89
+ # Tests that require C++11 support
84
90
add_executable (cxx_11_tests
85
91
main.cpp
86
92
cxx_11_tests.cpp
87
93
)
88
94
configure_tests (cxx_11_tests )
89
95
target_compile_features (cxx_11_tests PRIVATE cxx_std_11 )
90
96
91
- # Configure Valgrind
92
- if (${GFX_TIMSORT_USE_VALGRIND} )
93
- find_program (MEMORYCHECK_COMMAND valgrind )
94
- set (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --track-origins=yes --error-exitcode=1 --show-reachable=no" )
95
- if (APPLE )
96
- set (MEMORYCHECK_SUPPRESSIONS_FILE ${CMAKE_CURRENT_SOURCE_DIR} /valgrind-osx.supp )
97
- endif ()
98
- endif ()
99
-
100
97
include (CTest )
101
98
include (ParseAndAddCatchTests )
102
99
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments