Skip to content

Add support for gtest if testing is enabled. #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vgvassilev merged 8 commits into from
Apr 6, 2017
Merged

Add support for gtest if testing is enabled. #451

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c35b27d
Add support for gtest if testing is enabled.
vgvassilev Mar 20, 2017
2befa51
Address comments for PR#451:
vgvassilev Mar 31, 2017
48f6bc8
Workaround cmake/curl refusing to download a https file.
vgvassilev Apr 1, 2017
405426a
Workaround ninja dependencies re-stat behavior.
vgvassilev Apr 1, 2017
cd1255a
Add current folder to the list of includes.
vgvassilev Apr 3, 2017
12f9519
Add the path to the test name, following roottest convention.
vgvassilev Apr 3, 2017
4198148
Mangle the path in the test target. Glob for test files.
vgvassilev Apr 5, 2017
0d56bb1
Build the test binary in the test folder.
vgvassilev Apr 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Build the test binary in the test folder.
  • Loading branch information
@vgvassilev
vgvassilev committed Apr 6, 2017
commit 0d56bb1b2886855aad443a5eaf9e5c69ec504d3d
7 changes: 5 additions & 2 deletions cmake/modules/RootNewMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1113,6 +1113,8 @@ function(ROOT_ADD_UNITTEST_SUBDIRECTORY subdir)
# Get the component from the path. Eg. core to form coreTests test suite name.
ROOT_PATH_TO_STRING(test_name ${CMAKE_CURRENT_SOURCE_DIR}/Tests/)
ROOT_ADD_GTEST(${test_name} ${test_files} ${ARGN})
# Override the target output folder for to put the binaries in the ${subdir}.
set_property(TARGET ${test_name} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${subdir}/)
endfunction()

#----------------------------------------------------------------------------
Expand All @@ -1128,11 +1130,12 @@ function(ROOT_ADD_GTEST test_suite)
# FIXME: For better coherence we could restrict the libraries the test suite could link
# against. For example, tests in Core should link only against libCore. This could be tricky
# to implement because some ROOT components create more than one library.
ROOT_EXECUTABLE(${test_suite} NOINSTALL ${source_files} LIBRARIES ${ARG_LIBRARIES})
ROOT_EXECUTABLE(${test_suite} ${source_files} LIBRARIES ${ARG_LIBRARIES})
set_property(TARGET ${test_suite} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
target_link_libraries(${test_suite} gtest gtest_main gmock gmock_main)

ROOT_PATH_TO_STRING(mangled_name ${test_suite} PATH_SEPARATOR_REPLACEMENT "-")
ROOT_ADD_TEST(gtest${mangled_name} COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${test_suite})
ROOT_ADD_TEST(gtest${mangled_name} COMMAND ${test_suite})
endfunction()


Expand Down