summaryrefslogtreecommitdiff
path: root/rt
diff options
context:
space:
mode:
authorOndřej Bílka <neleai@seznam.cz>2013-12-03 20:16:01 +0100
committerOndřej Bílka <neleai@seznam.cz>2013-12-03 20:16:33 +0100
commitb20de2c3d9d751eb259c321426188eefc64fcbe9 (patch)
tree7dbc63638366cb722b5916fc4f6cd965c664dc39 /rt
parent34e16df5a1a46e128edb9eb44a09ac5762957136 (diff)
downloadglibc-b20de2c3d9d751eb259c321426188eefc64fcbe9.tar.gz
Properly handle shm_open validation. Fixes bug 16274.
Diffstat (limited to 'rt')
-rw-r--r--rt/tst-shm.c56
1 files changed, 21 insertions, 35 deletions
diff --git a/rt/tst-shm.c b/rt/tst-shm.c
index cb4b1ee764..83ad586ccf 100644
--- a/rt/tst-shm.c
+++ b/rt/tst-shm.c
@@ -34,34 +34,17 @@
/* We want to see output immediately. */
#define STDOUT_UNBUFFERED
-
-static int
-do_open (void)
-{
- int fd;
-
- /* Create the shared memory object. */
- fd = shm_open ("/shm-test", O_RDWR, 0600);
- if (fd == -1)
- {
- /* We don't regard this as a bug. Simply don't run the test. It could
- means there is no such implementation or the object is already in
- use in which case we don't want to disturb. */
- perror ("failed to open shared memory object: shm_open");
- return -1;
- }
-
- return fd;
-}
-
-
static void
worker (int write_now)
{
struct timespec ts;
struct stat64 st;
int i;
- int fd = do_open ();
+ int fd = shm_open ("/glibc-shm-test", O_RDWR, 0600);
+
+ if (fd == -1)
+ error (EXIT_FAILURE, 0, "failed to open shared memory object: shm_open");
+
char *mem;
if (fd == -1)
@@ -143,14 +126,17 @@ do_test (void)
/* Create the shared memory object. */
- fd = shm_open ("/shm-test", O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600);
+ fd = shm_open ("/glibc-shm-test", O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600);
if (fd == -1)
{
- /* We don't regard this as a bug. Simply don't run the test. It could
- means there is no such implementation or the object is already in
- use in which case we don't want to disturb. */
- perror ("failed to create a shared memory object: shm_open");
- return 0;
+ /* If shm_open is unimplemented we skip the test. */
+ if (errno == ENOSYS)
+ {
+ perror ("shm_open unimplemented. Test skipped.");
+ return 0;
+ }
+ else
+ error (EXIT_FAILURE, 0, "failed to create shared memory object: shm_open");
}
/* Size the object. We make it 4000 bytes long. */
@@ -160,18 +146,18 @@ do_test (void)
shared memory itself. */
perror ("failed to size of shared memory object: ftruncate");
close (fd);
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
return 0;
}
if (fstat64 (fd, &st) == -1)
{
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
error (EXIT_FAILURE, 0, "initial stat failed");
}
if (st.st_size != 4000)
{
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
error (EXIT_FAILURE, 0, "initial size not correct");
}
@@ -184,7 +170,7 @@ do_test (void)
/* Couldn't create a second process. */
perror ("fork");
close (fd);
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
return 0;
}
@@ -199,7 +185,7 @@ do_test (void)
kill (pid1, SIGTERM);
waitpid (pid1, &ignore, 0);
close (fd);
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
return 0;
}
@@ -208,14 +194,14 @@ do_test (void)
waitpid (pid2, &status2, 0);
/* Now we can unlink the shared object. */
- shm_unlink ("/shm-test");
+ shm_unlink ("/glibc-shm-test");
return (!WIFEXITED (status1) || WEXITSTATUS (status1) != 0
|| !WIFEXITED (status2) || WEXITSTATUS (status2) != 0);
}
#define TEST_FUNCTION do_test ()
-#define CLEANUP_HANDLER shm_unlink ("/shm-test");
+#define CLEANUP_HANDLER shm_unlink ("/glibc-shm-test");
#include "../test-skeleton.c"