aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2019-01-22 16:08:18 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2019-01-22 16:08:18 +0000
commit4c6b09810beee144208acfd097fee6f796961e94 (patch)
treef3c8afabe6017eee5f7d6ee4e92c3e9d5697a705
parent494df8753b8c0a4dd02e7208e0bae20bee6ec1d5 (diff)
downloadgcc-4c6b09810beee144208acfd097fee6f796961e94.zip
gcc-4c6b09810beee144208acfd097fee6f796961e94.tar.gz
gcc-4c6b09810beee144208acfd097fee6f796961e94.tar.bz2
PR libstdc++/88740 Print assertion messages to stderr
PR libstdc++/88740 * testsuite/util/testsuite_hooks.h [stderr] (VERIFY): Use fprintf to write to stderr instead of using printf. From-SVN: r268154
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/util/testsuite_hooks.h11
2 files changed, 15 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 483f195..4fd9fee 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-22 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/88740
+ * testsuite/util/testsuite_hooks.h [stderr] (VERIFY): Use fprintf to
+ write to stderr instead of using printf.
+
2019-01-21 Jakub Jelinek <jakub@redhat.com>
PR libstdc++/86590
diff --git a/libstdc++-v3/testsuite/util/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h
index 3999a5d..51c431b 100644
--- a/libstdc++-v3/testsuite/util/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h
@@ -46,18 +46,25 @@
#include <bits/c++config.h>
#include <bits/functexcept.h>
#include <ctime>
+#include <stdio.h>
#ifdef _GLIBCXX_HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
+#ifdef stderr
+# define _VERIFY_PRINT(S, F, L, P, C) __builtin_fprintf(stderr, S, F, L, P, C)
+#else
+# define _VERIFY_PRINT(S, F, L, P, C) __builtin_printf(S, F, L, P, C)
+#endif
+
#define VERIFY(fn) \
do \
{ \
if (! (fn)) \
{ \
- __builtin_printf("%s:%d: %s: Assertion '%s' failed.\n", \
- __FILE__, __LINE__, __PRETTY_FUNCTION__, #fn); \
+ _VERIFY_PRINT("%s:%d: %s: Assertion '%s' failed.\n", \
+ __FILE__, __LINE__, __PRETTY_FUNCTION__, #fn); \
__builtin_abort(); \
} \
} while (false)