Skip to content

Commit 6fd48e9

Browse files
committed
Supposedly final tweaks
1 parent 2110849 commit 6fd48e9

File tree

3 files changed

+7
-51
lines changed

3 files changed

+7
-51
lines changed

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,6 @@ matrix:
101101
compiler: gcc
102102

103103
# 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-
116104
- os: osx
117105
osx_image: xcode8.3
118106
env: BUILD_TYPE=Release CMAKE_GENERATOR="Xcode"

tests/CMakeLists.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ target_include_directories(Catch2 INTERFACE
2020
option(GFX_TIMSORT_USE_VALGRIND "Whether to run the tests with Valgrind" OFF)
2121
set(GFX_TIMSORT_SANITIZE "" CACHE STRING "Comma-separated list of options to pass to -fsanitize")
2222

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+
2329
macro(configure_tests target)
2430
# Add required dependencies to tests
2531
target_link_libraries(${target} PRIVATE
@@ -80,23 +86,14 @@ add_executable(cxx_98_tests
8086
configure_tests(cxx_98_tests)
8187
target_compile_features(cxx_98_tests PRIVATE cxx_std_98)
8288

83-
# Tests that require C++11 support to run
89+
# Tests that require C++11 support
8490
add_executable(cxx_11_tests
8591
main.cpp
8692
cxx_11_tests.cpp
8793
)
8894
configure_tests(cxx_11_tests)
8995
target_compile_features(cxx_11_tests PRIVATE cxx_std_11)
9096

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-
10097
include(CTest)
10198
include(ParseAndAddCatchTests)
10299

tests/valgrind-osx.supp

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)