diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-24 03:08:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-24 03:08:40 +0000 |
| commit | 855cbd218c514a663d7589a9d943c3183ad2c116 (patch) | |
| tree | 897d45f2601301b1f5aad20fc783cace1428fa74 | |
| parent | 687a85e105a4790e138e79319ae0080ede981d5f (diff) | |
| parent | 305e408aeadbc5a1d41e86cb28afd0e88d08bdd3 (diff) | |
| download | platform_external_ltp-android10-c2f2-s2-release.tar.gz platform_external_ltp-android10-c2f2-s2-release.tar.bz2 platform_external_ltp-android10-c2f2-s2-release.zip | |
Snap for 5749990 from 305e408aeadbc5a1d41e86cb28afd0e88d08bdd3 to qt-c2f2-releaseandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Change-Id: Iad4aae8d535a8fc3e6eedce1310e7e672aeb48cf
| -rw-r--r-- | testcases/kernel/syscalls/sendmmsg/sendmmsg01.c | 9 | ||||
| -rw-r--r-- | testcases/kernel/syscalls/statx/statx01.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c b/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c index d1bdf40a1..ce100b2ee 100644 --- a/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c +++ b/testcases/kernel/syscalls/sendmmsg/sendmmsg01.c @@ -5,6 +5,7 @@ #define _GNU_SOURCE #include <netinet/ip.h> +#include <semaphore.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -18,6 +19,8 @@ #define BUFSIZE 16 #define VLEN 2 +static sem_t send_sem; + static void *sender_thread(LTP_ATTRIBUTE_UNUSED void *arg) { struct sockaddr_in addr; @@ -50,6 +53,8 @@ static void *sender_thread(LTP_ATTRIBUTE_UNUSED void *arg) msg[1].msg_hdr.msg_iov = &msg2; msg[1].msg_hdr.msg_iovlen = 1; + sem_wait(&send_sem); + retval = sendmmsg(send_sockfd, msg, 2, 0); if (retval < 0) tst_brk(TFAIL|TTERRNO, "sendmmsg failed"); @@ -74,6 +79,8 @@ static void *receiver_thread(LTP_ATTRIBUTE_UNUSED void *arg) addr.sin_port = htons(1234); SAFE_BIND(receive_sockfd, (struct sockaddr *)&addr, sizeof(addr)); + sem_post(&send_sem); + memset(msgs, 0, sizeof(msgs)); for (i = 0; i < VLEN; i++) { iovecs[i].iov_base = bufs[i]; @@ -112,6 +119,8 @@ static void run(void) pthread_t sender; pthread_t receiver; + sem_init(&send_sem, 0, 0); + SAFE_PTHREAD_CREATE(&sender, NULL, sender_thread, NULL); SAFE_PTHREAD_CREATE(&receiver, NULL, receiver_thread, NULL); SAFE_PTHREAD_JOIN(sender, NULL); diff --git a/testcases/kernel/syscalls/statx/statx01.c b/testcases/kernel/syscalls/statx/statx01.c index 23ea99b4a..5e705dc7d 100644 --- a/testcases/kernel/syscalls/statx/statx01.c +++ b/testcases/kernel/syscalls/statx/statx01.c @@ -92,7 +92,7 @@ static void test_normal_file(void) buff.stx_mode, MODE); - if (buff.stx_blocks <= buff.stx_blksize/512) + if (buff.stx_blocks <= 128) tst_res(TPASS, "stx_blocks(%"PRIu64") is valid", buff.stx_blocks); else |