aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-08-26 18:33:19 -0700
committerElliott Hughes <enh@google.com>2016-08-26 19:23:39 -0700
commit40bae4fc89a32b6110ecfb16ef84a5fdb597ffac (patch)
tree7b50de95182b7a781336534fd02e3c60024a8749
parent0b1a2826508ee5b191650d1d8b1f6b028e970f3b (diff)
downloadbionic-40bae4fc89a32b6110ecfb16ef84a5fdb597ffac.tar.gz
Fix SysV IPC test failures on Android devices.
SysV IPC has been compiled out of all our kernels. Change-Id: I1294459697ed7dff4f21af5c7b04c8b3d3649329
-rw-r--r--tests/sys_msg_test.cpp13
-rw-r--r--tests/sys_sem_test.cpp13
-rw-r--r--tests/sys_shm_test.cpp13
3 files changed, 27 insertions, 12 deletions
diff --git a/tests/sys_msg_test.cpp b/tests/sys_msg_test.cpp
index e71597931..05ad01b76 100644
--- a/tests/sys_msg_test.cpp
+++ b/tests/sys_msg_test.cpp
@@ -34,6 +34,11 @@
#include "TemporaryFile.h"
TEST(sys_msg, smoke) {
+ if (msgctl(-1, IPC_STAT, nullptr) == -1 && errno == ENOSYS) {
+ GTEST_LOG_(INFO) << "no <sys/msg.h> support in this kernel\n";
+ return;
+ }
+
// Create a queue.
TemporaryDir dir;
key_t key = ftok(dir.dirname, 1);
@@ -72,23 +77,23 @@ TEST(sys_msg, smoke) {
TEST(sys_msg, msgctl_failure) {
errno = 0;
ASSERT_EQ(-1, msgctl(-1, IPC_STAT, nullptr));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_msg, msgget_failure) {
errno = 0;
ASSERT_EQ(-1, msgget(-1, 0));
- ASSERT_EQ(ENOENT, errno);
+ ASSERT_TRUE(errno == ENOENT || errno == ENOSYS);
}
TEST(sys_msg, msgrcv_failure) {
errno = 0;
ASSERT_EQ(-1, msgrcv(-1, nullptr, 0, 0, 0));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_msg, msgsnd_failure) {
errno = 0;
ASSERT_EQ(-1, msgsnd(-1, "", 0, 0));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
diff --git a/tests/sys_sem_test.cpp b/tests/sys_sem_test.cpp
index 5acc792ef..d8d83c5e0 100644
--- a/tests/sys_sem_test.cpp
+++ b/tests/sys_sem_test.cpp
@@ -34,6 +34,11 @@
#include "TemporaryFile.h"
TEST(sys_sem, smoke) {
+ if (semctl(-1, 0, IPC_RMID) == -1 && errno == ENOSYS) {
+ GTEST_LOG_(INFO) << "no <sys/sem.h> support in this kernel\n";
+ return;
+ }
+
// Create a semaphore.
TemporaryDir dir;
key_t key = ftok(dir.dirname, 1);
@@ -73,23 +78,23 @@ TEST(sys_sem, smoke) {
TEST(sys_sem, semget_failure) {
errno = 0;
ASSERT_EQ(-1, semget(-1, -1, 0));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_sem, semctl_failure) {
errno = 0;
ASSERT_EQ(-1, semctl(-1, 0, IPC_RMID));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_sem, semop_failure) {
errno = 0;
ASSERT_EQ(-1, semop(-1, nullptr, 0));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_sem, semtimedop_failure) {
errno = 0;
ASSERT_EQ(-1, semtimedop(-1, nullptr, 0, nullptr));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
diff --git a/tests/sys_shm_test.cpp b/tests/sys_shm_test.cpp
index 4929b8f9d..cf7f3a535 100644
--- a/tests/sys_shm_test.cpp
+++ b/tests/sys_shm_test.cpp
@@ -34,6 +34,11 @@
#include "TemporaryFile.h"
TEST(sys_shm, smoke) {
+ if (shmctl(-1, IPC_STAT, nullptr) == -1 && errno == ENOSYS) {
+ GTEST_LOG_(INFO) << "no <sys/shm.h> support in this kernel\n";
+ return;
+ }
+
// Create a segment.
TemporaryDir dir;
key_t key = ftok(dir.dirname, 1);
@@ -60,23 +65,23 @@ TEST(sys_shm, smoke) {
TEST(sys_shm, shmat_failure) {
errno = 0;
ASSERT_EQ(reinterpret_cast<void*>(-1), shmat(-1, 0, SHM_RDONLY));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_shm, shmctl_failure) {
errno = 0;
ASSERT_EQ(-1, shmctl(-1, IPC_STAT, nullptr));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_shm, shmdt_failure) {
errno = 0;
ASSERT_EQ(-1, shmdt(nullptr));
- ASSERT_EQ(EINVAL, errno);
+ ASSERT_TRUE(errno == EINVAL || errno == ENOSYS);
}
TEST(sys_shm, shmget_failure) {
errno = 0;
ASSERT_EQ(-1, shmget(-1, 1234, 0));
- ASSERT_EQ(ENOENT, errno);
+ ASSERT_TRUE(errno == ENOENT || errno == ENOSYS);
}