summaryrefslogtreecommitdiff
path: root/test/nptl
diff options
context:
space:
mode:
Diffstat (limited to 'test/nptl')
-rw-r--r--test/nptl/Makefile.in12
-rw-r--r--test/nptl/tst-cancel7.c7
-rw-r--r--test/nptl/tst-mqueue7.c4
-rw-r--r--test/nptl/tst-unload.c6
4 files changed, 10 insertions, 19 deletions
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
index 42a4654d6..700a464cf 100644
--- a/test/nptl/Makefile.in
+++ b/test/nptl/Makefile.in
@@ -38,11 +38,10 @@ TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3 \
tst-cancelx12 tst-cancelx13 tst-cancelx14 tst-cancelx15 tst-cancelx16 \
tst-cancelx18 tst-cancelx20 tst-cancelx21 tst-cleanupx0 tst-cleanupx1 \
tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 tst-cond22 tst-cond23 \
- tst-dlsym1 tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \
+ tst-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \
tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a \
- tst-basic7 tst-fini1 tst-signal7 \
- tst-unload tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 tst-sem12 \
- tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \
+ tst-basic7 tst-signal7 tst-vfork1x tst-vfork2x tst-sem10 tst-sem11 \
+ tst-sem12 tst-typesizes tst-initializers1-c89 tst-initializers1-c99 \
tst-initializers1-gnu89 tst-initializers1-gnu99
#
@@ -68,7 +67,8 @@ GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \
ifeq ($(HAVE_SHARED),)
-TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5
+TESTS_DISABLED += tst-tls3 tst-tls4 tst-tls5 tst-dlsym1 tst-fini1 \
+ tst-unload
else
GLIBC_TESTS_DISABLED += tst-tls3_glibc tst-tls4_glibc tst-tls5_glibc
endif
@@ -109,7 +109,7 @@ LDFLAGS_tst-rwlock14 = -lrt
LDFLAGS_tst-fini1 = -Wl,-rpath=./ tst-fini1mod.so
LDFLAGS_tst-fini1mod.so = -Wl,-soname=tst-fini1mod.so
LDFLAGS_tst-unload = -ldl
-LDFLAGS_tst-cancel5 := -lpthread -lpthread_nonshared
+LDFLAGS_tst-cancel5 := -lpthread
LDFLAGS_tst-cancel23 := -lc -lpthread
LDFLAGS_tst-vfork1x := -lc -lpthread
LDFLAGS_tst-vfork2x := -lc -lpthread
diff --git a/test/nptl/tst-cancel7.c b/test/nptl/tst-cancel7.c
index bb9f739d3..9e7d22ed5 100644
--- a/test/nptl/tst-cancel7.c
+++ b/test/nptl/tst-cancel7.c
@@ -193,14 +193,8 @@ do_cleanup (void)
}
#endif
-#define OPT_COMMAND 10000
-#define OPT_PIDFILE 10001
#define CMDLINE_OPTIONS \
"c:p:"
-/*
- { "command", required_argument, NULL, OPT_COMMAND }, \
- { "pidfile", required_argument, NULL, OPT_PIDFILE },
-*/
#define CMDLINE_PROCESS \
case 'c': \
command = optarg; \
@@ -208,7 +202,6 @@ do_cleanup (void)
case 'p': \
pidfile = optarg; \
break;
-// #define CLEANUP_HANDLER do_cleanup ()
#define PREPARE(argc, argv) do_prepare (argc, argv)
#define TEST_FUNCTION do_test ()
#define TIMEOUT 5
diff --git a/test/nptl/tst-mqueue7.c b/test/nptl/tst-mqueue7.c
index 12c6d9a37..1892f951a 100644
--- a/test/nptl/tst-mqueue7.c
+++ b/test/nptl/tst-mqueue7.c
@@ -33,9 +33,7 @@ static mqd_t after_exec = (mqd_t) -1;
#define CMDLINE_OPTIONS \
"a:"
-/*
- { "after-exec", required_argument, NULL, OPT_AFTEREXEC },
-*/
+
#define CMDLINE_PROCESS \
case 'a': \
after_exec = (mqd_t) strtoul (optarg, NULL, 0); \
diff --git a/test/nptl/tst-unload.c b/test/nptl/tst-unload.c
index c7de2cb91..74a714ecb 100644
--- a/test/nptl/tst-unload.c
+++ b/test/nptl/tst-unload.c
@@ -23,17 +23,17 @@
static int
do_test (void)
{
- void *p = dlopen ("libpthread.so.0", RTLD_LAZY);
+ void *p = dlopen ("libpthread.so.1", RTLD_LAZY);
if (p == NULL)
{
- puts ("failed to load libpthread.so.0");
+ puts ("failed to load libpthread.so.1");
return 1;
}
if (dlclose (p) != 0)
{
- puts ("dlclose (libpthread.so.0) failed");
+ puts ("dlclose (libpthread.so.1) failed");
return 1;
}