aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitry Ivanov <dimitry@google.com>2016-01-11 18:43:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-11 18:43:40 +0000
commita9f3be9fd0a9caebf9878e5f6b960100225351a8 (patch)
treee9e6c276e23bd7438cb3da311dddcca41370b901
parent028efee0556e63573cc9fcd9fc7ac99c46c38f46 (diff)
parentae836939d5061fdb1c9115a7bf37bca892899e04 (diff)
downloadndk-a9f3be9fd0a9caebf9878e5f6b960100225351a8.tar.gz
Merge "Remove test for wait3"
am: ae836939d5 * commit 'ae836939d5061fdb1c9115a7bf37bca892899e04': Remove test for wait3
-rw-r--r--tests/device/test-wait/jni/test_wait.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/tests/device/test-wait/jni/test_wait.c b/tests/device/test-wait/jni/test_wait.c
index fd22640d6..d6ce4d7ac 100644
--- a/tests/device/test-wait/jni/test_wait.c
+++ b/tests/device/test-wait/jni/test_wait.c
@@ -90,21 +90,6 @@ static int check_waitpid(pid_t child_pid) {
return WEXITSTATUS(status);
}
-// wait3 was removed from POSIX 2004 and is not in Bionic's LP64 ABIs.
-#if !defined(__LP64__)
-// To be called by check_wait_call() to check wait3()
-static int check_wait3(pid_t child_pid) {
- int status = 0;
- struct rusage ru;
- pid_t ret = wait3(&status, 0, &ru);
- if (ret != child_pid) {
- fprintf(stderr, "ERROR: wait3() returned %d, expected %d\n", ret, child_pid);
- return -1;
- }
- return WEXITSTATUS(status);
-}
-#endif
-
// To be called by check_wait_call() to check wait3()
static int check_wait4(pid_t child_pid) {
int status = 0;
@@ -124,12 +109,6 @@ int main(int argc, char *argv[]) {
if (!check_wait_call("waitpid", check_waitpid, CHILD_EXIT_CODE + 1)) {
return EXIT_FAILURE;
}
-// wait3 was removed from POSIX 2004 and is not in Bionic's LP64 ABIs.
-#if !defined(__LP64__)
- if (!check_wait_call("wait3", check_wait3, CHILD_EXIT_CODE + 2)) {
- return EXIT_FAILURE;
- }
-#endif
if (!check_wait_call("wait4", check_wait4, CHILD_EXIT_CODE + 3)) {
return EXIT_FAILURE;
}