diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-04 16:19:41 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-10-04 16:19:41 -0400 |
| commit | 2b7a4a59633877de9ca33c8711f67bca8905de1f (patch) | |
| tree | 0fb198f601cb9bea59e14d64ad98d56981f4a0ff /cpp/test/IceUtil | |
| parent | Fix syslog logger to correctly display program name (diff) | |
| download | ice-2b7a4a59633877de9ca33c8711f67bca8905de1f.tar.bz2 ice-2b7a4a59633877de9ca33c8711f67bca8905de1f.tar.xz ice-2b7a4a59633877de9ca33c8711f67bca8905de1f.zip | |
Fix stacktrace test with Xcode 10 release builds (#232)
Diffstat (limited to 'cpp/test/IceUtil')
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 6 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS | 9 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS (renamed from cpp/test/IceUtil/stacktrace/StackTrace.release.macOS) | 0 |
3 files changed, 15 insertions, 0 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index 642be3cfe8d..7a5d2a50aa1 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -136,6 +136,12 @@ Client::run(int argc, char* argv[]) # elif(_MSC_VER >= 1910) filename += "-vc141"; # endif +#elif defined(__apple_build_version__) +# if(__apple_build_version__ >= 10001145) + filename += "-xcode10"; + #else + filename += "-xcode9"; + #endif #endif } else diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS new file mode 100644 index 00000000000..e86b55a8152 --- /dev/null +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode10.macOS @@ -0,0 +1,9 @@ + 0 IceUtil::NullHandleException::NullHandleException(char const*, int) in libIce.3.7.1.dylib + 1 (anonymous namespace)::Thrower::fifth() in client + 2 (anonymous namespace)::Thrower::forth() in client + 3 (anonymous namespace)::Thrower::third() in client + 4 (anonymous namespace)::Thrower::second() in client + 5 Client::run(int, char**) in client + 6 int Test::runTest<Client>(int, char**) in client + 7 start in libdyld.dylib +
\ No newline at end of file diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS index 2f4ae2a8cd0..2f4ae2a8cd0 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.release.macOS +++ b/cpp/test/IceUtil/stacktrace/StackTrace.release-xcode9.macOS |