From: Rhys Kidd <rhyskidd@gmail.com>
Date: Sat, 21 Mar 2015 14:25:02 +0000 (+0000)
Subject: Fix memcheck/tests/strchr on OS X
X-Git-Tag: svn/VALGRIND_3_11_0~562
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4669a612282790eee288533740dc55db401a5914;p=thirdparty%2Fvalgrind.git

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 1e29c4efb6..6fd4415fb6 100644
--- 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 45dfd537e0..cde6cca393 100755
--- 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:/"