summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-04-29 07:27:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-04-29 07:27:50 +0000
commit03d495473969b196f5b121450cd7c0cfaec67f5e (patch)
tree8143dafec8ced8d9711d446cd728739a93b594a9
parent47679487e8895863dc3c669e178792547e759a5a (diff)
parentca4e5e87e5bf18698638b43a4b0a954e1f900028 (diff)
downloadextras-03d495473969b196f5b121450cd7c0cfaec67f5e.tar.gz
Snap for 4751833 from ca4e5e87e5bf18698638b43a4b0a954e1f900028 to pi-release
Change-Id: Idaef846e750b317ce347711bdef8bc77a7921b6d
-rw-r--r--tests/kernel.config/sysvipc_test.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/tests/kernel.config/sysvipc_test.cpp b/tests/kernel.config/sysvipc_test.cpp
index 49952f01..015991d6 100644
--- a/tests/kernel.config/sysvipc_test.cpp
+++ b/tests/kernel.config/sysvipc_test.cpp
@@ -18,6 +18,10 @@
#include <linux/kcmp.h>
#include <sys/syscall.h>
#endif
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
#include <unistd.h>
#include <gtest/gtest.h>
@@ -36,9 +40,19 @@ TEST(kernel_config, NOT_CONFIG_SYSVIPC) {
EXPECT_EQ(-1, kcmp(pid, pid, KCMP_SYSVSEM, 0, 0));
EXPECT_EQ(EOPNOTSUPP, error);
#endif
- EXPECT_EQ(-1, access("/proc/sysvipc", F_OK));
+
+ EXPECT_EQ(-1, access("/proc/sysvipc", R_OK));
+
EXPECT_EQ(-1, access("/proc/sysvipc/msg", F_OK));
+ EXPECT_EQ(-1, msgctl(-1, IPC_STAT, nullptr));
+ EXPECT_EQ(ENOSYS, errno);
+
EXPECT_EQ(-1, access("/proc/sysvipc/sem", F_OK));
+ EXPECT_EQ(-1, semctl(-1, 0, IPC_STAT, nullptr));
+ EXPECT_EQ(ENOSYS, errno);
+
EXPECT_EQ(-1, access("/proc/sysvipc/shm", F_OK));
+ EXPECT_EQ(-1, shmctl(-1, IPC_STAT, nullptr));
+ EXPECT_EQ(ENOSYS, errno);
}