[compiler-rt] r350965 - [Sanitizer] Disable getusershell interception for Android

[David Carlier via llvm-commits]

Author: devnexen
Date: Fri Jan 11 12:09:24 2019
New Revision: 350965

URL: http://llvm.org/viewvc/llvm-project?rev=350965&view=rev
Log:
[Sanitizer] Disable getusershell interception for Android

Reviewers: vitalybuka, pcc, eugenis

Reviewed By: eugenis

Differential Revision: https://reviews.llvm.org/D56583

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
    compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getusershell.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h?rev=350965&r1=350964&r2=350965&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_interceptors.h Fri Jan 11 12:09:24 2019
@@ -548,7 +548,7 @@
 #define SANITIZER_INTERCEPT_GETFSENT (SI_FREEBSD || SI_NETBSD || SI_MAC)
 #define SANITIZER_INTERCEPT_ARC4RANDOM (SI_FREEBSD || SI_NETBSD)
 #define SANITIZER_INTERCEPT_FDEVNAME SI_FREEBSD
-#define SANITIZER_INTERCEPT_GETUSERSHELL SI_POSIX
+#define SANITIZER_INTERCEPT_GETUSERSHELL (SI_POSIX && !SI_POSIX)
 
 #define SANITIZER_INTERCEPT_POPEN SI_POSIX
 #define SANITIZER_INTERCEPT_POPENVE SI_NETBSD

Modified: compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getusershell.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getusershell.cc?rev=350965&r1=350964&r2=350965&view=diff
==============================================================================
--- compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getusershell.cc (original)
+++ compiler-rt/trunk/test/sanitizer_common/TestCases/Posix/getusershell.cc Fri Jan 11 12:09:24 2019
@@ -1,6 +1,6 @@
 // RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
 
-// XFAIL: android
+// UNSUPPORTED: android
 
 #include <assert.h>
 #include <errno.h>