diff options
| author | Derek Mauro <dmauro@google.com> | 2018-07-10 19:39:23 (GMT) |
|---|---|---|
| committer | Derek Mauro <dmauro@google.com> | 2018-07-10 19:39:23 (GMT) |
| commit | d772e2039b2dd4ebd137659e8d6297e6cf04697e (patch) | |
| tree | 0e6d5fc920140670b0ea2fcdd3ebc98b09c54776 /googletest | |
| parent | 4c417877648f5f240aecead1c19d7c1fd340423b (diff) | |
| download | googletest-d772e2039b2dd4ebd137659e8d6297e6cf04697e.zip googletest-d772e2039b2dd4ebd137659e8d6297e6cf04697e.tar.gz googletest-d772e2039b2dd4ebd137659e8d6297e6cf04697e.tar.bz2 | |
Pass the --no_stacktrace_support argument to the CMake tests
This does the same thing to the CMake tests that is done to the
Bazel tests, and now makes the CMake tests pass.
Diffstat (limited to 'googletest')
| -rw-r--r-- | googletest/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | googletest/cmake/internal_utils.cmake | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt index b09c46e..2e412d7 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt @@ -284,7 +284,7 @@ if (gtest_build_tests) py_test(gtest_list_tests_unittest) cxx_executable(gtest_output_test_ test gtest) - py_test(gtest_output_test) + py_test(gtest_output_test --no_stacktrace_support) cxx_executable(gtest_shuffle_test_ test gtest) py_test(gtest_shuffle_test) @@ -307,6 +307,6 @@ if (gtest_build_tests) py_test(gtest_json_outfiles_test) cxx_executable(gtest_xml_output_unittest_ test gtest) - py_test(gtest_xml_output_unittest) + py_test(gtest_xml_output_unittest --no_stacktrace_support) py_test(gtest_json_output_unittest) endif() diff --git a/googletest/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake index 6448918..be7af38 100644 --- a/googletest/cmake/internal_utils.cmake +++ b/googletest/cmake/internal_utils.cmake @@ -257,14 +257,14 @@ function(py_test name) add_test( NAME ${name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>) + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG> ${ARGN}) else (CMAKE_CONFIGURATION_TYPES) # Single-configuration build generators like Makefile generators # don't have subdirs below CMAKE_CURRENT_BINARY_DIR. add_test( NAME ${name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}) + --build_dir=${CMAKE_CURRENT_BINARY_DIR} ${ARGN}) endif (CMAKE_CONFIGURATION_TYPES) else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) # ${CMAKE_CURRENT_BINARY_DIR} is known at configuration time, so we can @@ -274,7 +274,7 @@ function(py_test name) add_test( ${name} ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py - --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) + --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE} ${ARGN}) endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) endif(PYTHONINTERP_FOUND) endfunction() |