Skip to content

Commit 76a4f74

Browse files
committed
do not test torture with addr2line
1 parent bc00bc4 commit 76a4f74

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ endif()
148148

149149
message(STATUS "Boost.stacktrace default backend: ${__default_stacktrace_backend}")
150150
target_link_libraries(boost_stacktrace INTERFACE Boost::stacktrace_${__default_stacktrace_backend})
151-
unset(__default_stacktrace_backend)
152151

153152
# Boost::stacktrace_from_exception is never the default
154153
if(_enable_non_noop_backend)
@@ -159,3 +158,4 @@ endif()
159158
if(BUILD_TESTING)
160159
add_subdirectory(test)
161160
endif()
161+
unset(__default_stacktrace_backend)

test/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ add_stacktrace_test(test Boost::stacktrace test_impl.cpp)
2424
add_stacktrace_test(test_thread_safety_checking "Boost::stacktrace;Boost::optional" test_impl.cpp)
2525
add_stacktrace_test(test_from_exception "Boost::stacktrace;Boost::stacktrace_from_exception" "")
2626
add_stacktrace_test(test_from_exception_none Boost::stacktrace "")
27-
add_stacktrace_test(test_torture Boost::stacktrace test_impl.cpp)
27+
if(NOT __default_stacktrace_backend STREQUAL "addr2line")
28+
add_stacktrace_test(test_torture Boost::stacktrace test_impl.cpp)
29+
endif()

test/test_from_exception.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ BOOST_NOINLINE BOOST_SYMBOL_VISIBLE void test_rethrow_nested() {
146146
} catch (...) {
147147
auto trace = stacktrace::from_current_exception();
148148
BOOST_TEST(trace);
149-
std::cout << "Tarce in test_rethrow_nested(): " << trace << '\n';
149+
std::cout << "Trace in test_rethrow_nested(): " << trace << '\n';
150150
BOOST_TEST(to_string(trace).find("in_test_throw_1") == std::string::npos);
151151
#if defined(BOOST_MSVC)
152152
BOOST_TEST(to_string(trace).find("in_test_throw_2") == std::string::npos);

0 commit comments

Comments
 (0)