From b37fa39b2b5c602971a957fa50f8ae4e52371cfe Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 23 Jul 2009 10:10:30 +0000 Subject: [PATCH] Let DRD print a warning at startup that support for Darwin is still considered experimental, and filter out this warning from the regression tests. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10554 --- drd/drd_main.c | 8 ++++++-- drd/tests/filter_stderr | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drd/drd_main.c b/drd/drd_main.c index 3fde8d26c7..b3b3708306 100644 --- a/drd/drd_main.c +++ b/drd/drd_main.c @@ -544,8 +544,12 @@ static void drd_thread_finished(ThreadId vg_tid) static void DRD_(post_clo_init)(void) { -#if !defined(VGO_linux) && !defined(VGO_darwin) - VG_(printf)("\nWARNING: DRD has only been tested on Linux and on Darwin.\n\n"); +#if defined(VGO_linux) + /* fine */ +#elif defined(VGO_darwin) + VG_(printf)("\nWARNING: DRD support for Darwin is still considered as experimental.\n\n"); +#else + VG_(printf)("\nWARNING: DRD has not yet been tested on this operating system.\n\n"); # endif if (DRD_(s_var_info)) diff --git a/drd/tests/filter_stderr b/drd/tests/filter_stderr index 7db91d9614..09652c9cff 100755 --- a/drd/tests/filter_stderr +++ b/drd/tests/filter_stderr @@ -33,6 +33,9 @@ sed \ # (consists of two lines) and also the empty line above it. awk 'BEGIN{begin=1} {if ($0 == "More than 100 errors detected. Subsequent errors") { getline; getline; } else { if (begin) begin = 0; else print last_line; }; last_line = $0; } END { if (! begin) print last_line; }' | +# Remove the message about experimental support for Darwin. +awk 'BEGIN{begin=1} { if ($0 == "WARNING: DRD support for Darwin is still considered as experimental.") { getline; getline; } else { if (begin) begin = 0; else print last_line; }; last_line = $0; } END { if (! begin) print last_line; }' | + # Anonymise addresses $dir/../../tests/filter_addresses -- 2.47.3