diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-07 19:33:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-07 19:33:02 +0300 |
| commit | c9040fd25b58d74b69418a9badecaf23e4076bf0 (patch) | |
| tree | 52569bc46e486764aa4a27141c4cf31493808097 /src | |
| parent | d785186e1dd69a0fc84ad241bc039ee865bdad2e (diff) | |
| download | manaplus-c9040fd25b58d74b69418a9badecaf23e4076bf0.tar.gz manaplus-c9040fd25b58d74b69418a9badecaf23e4076bf0.tar.bz2 manaplus-c9040fd25b58d74b69418a9badecaf23e4076bf0.tar.xz manaplus-c9040fd25b58d74b69418a9badecaf23e4076bf0.zip | |
Revert "Fix catch compilation without HAVE_EXECINFO define."
This reverts commit 9bbd191307c97c7589f93a64a4eb9abf3f11c46b.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/catch.hpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/test/catch.hpp b/src/test/catch.hpp index ffaa1d3d6..555760450 100644 --- a/src/test/catch.hpp +++ b/src/test/catch.hpp @@ -6774,14 +6774,11 @@ namespace Catch { message2.append(strings[i]).append("\n"); free(strings); } - - tempResult.message = message2; -#else // HAVE_EXECINFO - - tempResult.message = message; #endif // HAVE_EXECINFO // stack + tempResult.message = message2; + AssertionResult result(m_lastAssertionInfo, tempResult); getResultCapture().assertionEnded(result); |