summaryrefslogtreecommitdiff
path: root/cpp/test/IceUtil/stacktrace/Client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/IceUtil/stacktrace/Client.cpp')
-rw-r--r--cpp/test/IceUtil/stacktrace/Client.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp
index ffafedbb9ec..f7e7c84b652 100644
--- a/cpp/test/IceUtil/stacktrace/Client.cpp
+++ b/cpp/test/IceUtil/stacktrace/Client.cpp
@@ -223,7 +223,12 @@ int main(int argc, char* argv[])
if(!optimized && IceUtilInternal::stackTraceImpl() == IceUtilInternal::STLibbacktracePlus)
{
+ // Libbacktrace with GCC 4.8 and pie return a smaller backtrace
+# if defined(__pie__) && defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 408)
+ filename += ".libbacktrace+48pie";
+# else
filename += ".libbacktrace+";
+# endif
}
#endif
@@ -241,6 +246,9 @@ int main(int argc, char* argv[])
return EXIT_FAILURE;
}
+ // Show which template we use:
+ cout << filename << "... ";
+
stringstream sstr;
sstr << ifs.rdbuf();
#if defined(__APPLE__)