Fix memcheck/tests/strchr on OS X

bz#345394
- Support the required index and _platform_strchr alias

Before:

== 589 tests, 239 stderr failures, 22 stdout failures, 0 stderrB failures, 0 stdoutB failures, 31 post failures ==

After:

== 589 tests, 238 stderr failures, 22 stdout failures, 0 stderrB failures, 0 stdoutB failures, 31 post failures ==

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15030

diff --git a/NEWS b/NEWS
index 1e29c4efb6ad880cde5da69572c310b449ede401..6fd4415fb6307cca0032a1c71c30e152d0a02de9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -143,6 +143,7 @@ where XXXXXX is the bug number as listed below.
 344702  Fix missing libobjc suppressions on OS X 10.10
 344939  Fix memcheck/tests/xml1 on OS X 10.10
 345016  helgrind/tests/locked_vs_unlocked2 is failing sometimes
+345394  Fix memcheck/tests/strchr on OS X
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/memcheck/tests/filter_strchr b/memcheck/tests/filter_strchr
index 45dfd537e0c46d8938ed56756b8d22ff79e4be41..cde6cca3931df0614cbd26192d8a40103a5db2c2 100755 (executable)
--- a/memcheck/tests/filter_strchr
+++ b/memcheck/tests/filter_strchr
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# vg_replace_strmem.c [r]index and [__GI_]str[r]chr are the same.
+# vg_replace_strmem.c [r]index and [_platform_]str[r]chr are the same.
 ./filter_stderr "$@" |
 sed -e "s/: strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/;
+        s/: _platform_strchr (vg_replace_strmem.c:/: index (vg_replace_strmem.c:/;
         s/: strrchr (vg_replace_strmem.c:/: rindex (vg_replace_strmem.c:/"