From 99ef2719fb3d703fe38c4113cd7f5adec516dd3a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Fri, 28 Oct 2016 20:29:21 +0200
Subject: test: remove test suite

The test suite is now a developed in a separate git repository.
See here:
http://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng-test.git

The test suite should be just like every other software compiled
with the cross-toolchain. In the past strange problems where found
when the test suite got build in the toolchain creation step.
---
 test/nptl/Makefile                  |    8 -
 test/nptl/Makefile.in               |  242 ----
 test/nptl/eintr.c                   |   88 --
 test/nptl/tst-align.c               |   70 -
 test/nptl/tst-align2.c              |   86 --
 test/nptl/tst-align3.c              |   56 -
 test/nptl/tst-atfork1.c             |  120 --
 test/nptl/tst-atfork2.c             |  156 ---
 test/nptl/tst-atfork2mod.c          |   57 -
 test/nptl/tst-attr1.c               |  305 -----
 test/nptl/tst-attr2.c               |  316 -----
 test/nptl/tst-attr3.c               |  419 ------
 test/nptl/tst-barrier1.c            |   70 -
 test/nptl/tst-barrier2.c            |  184 ---
 test/nptl/tst-barrier3.c            |  153 ---
 test/nptl/tst-barrier4.c            |  121 --
 test/nptl/tst-basic1.c              |   81 --
 test/nptl/tst-basic2.c              |  120 --
 test/nptl/tst-basic3.c              |   86 --
 test/nptl/tst-basic4.c              |  100 --
 test/nptl/tst-basic5.c              |   73 --
 test/nptl/tst-basic6.c              |  131 --
 test/nptl/tst-basic7.c              |   75 --
 test/nptl/tst-cancel1.c             |  162 ---
 test/nptl/tst-cancel10.c            |  125 --
 test/nptl/tst-cancel11.c            |  122 --
 test/nptl/tst-cancel12.c            |  126 --
 test/nptl/tst-cancel13.c            |  128 --
 test/nptl/tst-cancel14.c            |  136 --
 test/nptl/tst-cancel15.c            |  141 ---
 test/nptl/tst-cancel16.c            |  230 ----
 test/nptl/tst-cancel18.c            |  173 ---
 test/nptl/tst-cancel19.c            |  286 -----
 test/nptl/tst-cancel2.c             |   99 --
 test/nptl/tst-cancel20.c            |  263 ----
 test/nptl/tst-cancel21.c            |  293 -----
 test/nptl/tst-cancel22.c            |  121 --
 test/nptl/tst-cancel23.c            |    1 -
 test/nptl/tst-cancel25.c            |  171 ---
 test/nptl/tst-cancel3.c             |   97 --
 test/nptl/tst-cancel4.c             | 2393 -----------------------------------
 test/nptl/tst-cancel5.c             |    1 -
 test/nptl/tst-cancel6.c             |   78 --
 test/nptl/tst-cancel7.c             |  208 ---
 test/nptl/tst-cancel8.c             |  142 ---
 test/nptl/tst-cancel9.c             |  125 --
 test/nptl/tst-cancelx10.c           |    1 -
 test/nptl/tst-cancelx11.c           |    1 -
 test/nptl/tst-cancelx12.c           |    1 -
 test/nptl/tst-cancelx13.c           |    1 -
 test/nptl/tst-cancelx14.c           |    1 -
 test/nptl/tst-cancelx15.c           |    1 -
 test/nptl/tst-cancelx16.c           |    1 -
 test/nptl/tst-cancelx18.c           |    1 -
 test/nptl/tst-cancelx2.c            |    1 -
 test/nptl/tst-cancelx20.c           |    1 -
 test/nptl/tst-cancelx21.c           |    1 -
 test/nptl/tst-cancelx3.c            |    1 -
 test/nptl/tst-cancelx4.c            |    1 -
 test/nptl/tst-cancelx6.c            |    1 -
 test/nptl/tst-cancelx7.c            |    1 -
 test/nptl/tst-cancelx8.c            |    1 -
 test/nptl/tst-cancelx9.c            |    1 -
 test/nptl/tst-cleanup0.c            |   75 --
 test/nptl/tst-cleanup1.c            |   99 --
 test/nptl/tst-cleanup2.c            |   62 -
 test/nptl/tst-cleanup3.c            |   97 --
 test/nptl/tst-cleanup4.c            |  197 ---
 test/nptl/tst-cleanup4aux.c         |  120 --
 test/nptl/tst-cleanupx0.c           |    1 -
 test/nptl/tst-cleanupx1.c           |    1 -
 test/nptl/tst-cleanupx2.c           |    1 -
 test/nptl/tst-cleanupx3.c           |    1 -
 test/nptl/tst-cleanupx4.c           |    1 -
 test/nptl/tst-clock.c               |  123 --
 test/nptl/tst-clock1.c              |   50 -
 test/nptl/tst-clock2.c              |  201 ---
 test/nptl/tst-clock_nanosleep.c     |   57 -
 test/nptl/tst-cond-deadlock.c       |   51 -
 test/nptl/tst-cond1.c               |   93 --
 test/nptl/tst-cond10.c              |  172 ---
 test/nptl/tst-cond11.c              |  190 ---
 test/nptl/tst-cond12.c              |  195 ---
 test/nptl/tst-cond13.c              |    2 -
 test/nptl/tst-cond14.c              |  117 --
 test/nptl/tst-cond15.c              |  159 ---
 test/nptl/tst-cond16.c              |  104 --
 test/nptl/tst-cond17.c              |    2 -
 test/nptl/tst-cond18.c              |  116 --
 test/nptl/tst-cond19.c              |   75 --
 test/nptl/tst-cond2.c               |  162 ---
 test/nptl/tst-cond20.c              |  169 ---
 test/nptl/tst-cond21.c              |    3 -
 test/nptl/tst-cond22.c              |  160 ---
 test/nptl/tst-cond23.c              |  183 ---
 test/nptl/tst-cond3.c               |  112 --
 test/nptl/tst-cond4.c               |  263 ----
 test/nptl/tst-cond5.c               |  105 --
 test/nptl/tst-cond6.c               |  233 ----
 test/nptl/tst-cond7.c               |  167 ---
 test/nptl/tst-cond8.c               |  276 ----
 test/nptl/tst-cond9.c               |  149 ---
 test/nptl/tst-cpuclock1.c           |  306 -----
 test/nptl/tst-cpuclock2.c           |  331 -----
 test/nptl/tst-cputimer1.c           |   68 -
 test/nptl/tst-cputimer2.c           |   83 --
 test/nptl/tst-cputimer3.c           |  130 --
 test/nptl/tst-detach1.c             |   55 -
 test/nptl/tst-dlsym1.c              |   66 -
 test/nptl/tst-eintr1.c              |  104 --
 test/nptl/tst-eintr2.c              |  117 --
 test/nptl/tst-eintr3.c              |   71 --
 test/nptl/tst-eintr4.c              |   55 -
 test/nptl/tst-eintr5.c              |   80 --
 test/nptl/tst-exec2.c               |  153 ---
 test/nptl/tst-exec3.c               |  151 ---
 test/nptl/tst-exec4.c               |  115 --
 test/nptl/tst-exit1.c               |   78 --
 test/nptl/tst-exit2.c               |   40 -
 test/nptl/tst-exit3.c               |   81 --
 test/nptl/tst-fini1.c               |   34 -
 test/nptl/tst-fini1mod.c            |   71 --
 test/nptl/tst-flock1.c              |   92 --
 test/nptl/tst-flock2.c              |  259 ----
 test/nptl/tst-fork1.c               |  119 --
 test/nptl/tst-fork2.c               |   89 --
 test/nptl/tst-fork3.c               |  106 --
 test/nptl/tst-fork4.c               |   64 -
 test/nptl/tst-getpid1.c             |  122 --
 test/nptl/tst-getpid2.c             |    2 -
 test/nptl/tst-getpid3.c             |  114 --
 test/nptl/tst-initializers1-c89.c   |    1 -
 test/nptl/tst-initializers1-c99.c   |    1 -
 test/nptl/tst-initializers1-gnu89.c |    1 -
 test/nptl/tst-initializers1-gnu99.c |    1 -
 test/nptl/tst-initializers1.c       |   47 -
 test/nptl/tst-join1.c               |   82 --
 test/nptl/tst-join2.c               |  103 --
 test/nptl/tst-join3.c               |  122 --
 test/nptl/tst-join4.c               |  124 --
 test/nptl/tst-join5.c               |  142 ---
 test/nptl/tst-join6.c               |    2 -
 test/nptl/tst-key1.c                |   88 --
 test/nptl/tst-key2.c                |  114 --
 test/nptl/tst-key3.c                |  155 ---
 test/nptl/tst-key4.c                |  136 --
 test/nptl/tst-kill1.c               |   99 --
 test/nptl/tst-kill2.c               |  138 --
 test/nptl/tst-kill3.c               |  158 ---
 test/nptl/tst-kill4.c               |   73 --
 test/nptl/tst-kill5.c               |   48 -
 test/nptl/tst-kill6.c               |  161 ---
 test/nptl/tst-mqueue.h              |   83 --
 test/nptl/tst-mqueue1.c             |  416 ------
 test/nptl/tst-mqueue2.c             |  476 -------
 test/nptl/tst-mqueue3.c             |  243 ----
 test/nptl/tst-mqueue4.c             |  287 -----
 test/nptl/tst-mqueue5.c             | 1013 ---------------
 test/nptl/tst-mqueue6.c             |  304 -----
 test/nptl/tst-mqueue7.c             |  108 --
 test/nptl/tst-mqueue8.c             |  265 ----
 test/nptl/tst-mqueue9.c             |   91 --
 test/nptl/tst-mutex1.c              |   56 -
 test/nptl/tst-mutex2.c              |  222 ----
 test/nptl/tst-mutex3.c              |  224 ----
 test/nptl/tst-mutex4.c              |  190 ---
 test/nptl/tst-mutex5.c              |  185 ---
 test/nptl/tst-mutex5a.c             |    2 -
 test/nptl/tst-mutex6.c              |   54 -
 test/nptl/tst-mutex7.c              |  120 --
 test/nptl/tst-mutex7a.c             |    2 -
 test/nptl/tst-mutex8.c              |  366 ------
 test/nptl/tst-mutex9.c              |  190 ---
 test/nptl/tst-oddstacklimit.c       |    1 -
 test/nptl/tst-once1.c               |   50 -
 test/nptl/tst-once2.c               |  103 --
 test/nptl/tst-once3.c               |  161 ---
 test/nptl/tst-once4.c               |  201 ---
 test/nptl/tst-oncex3.c              |    1 -
 test/nptl/tst-oncex4.c              |    1 -
 test/nptl/tst-popen1.c              |   59 -
 test/nptl/tst-raise1.c              |   61 -
 test/nptl/tst-rwlock1.c             |  116 --
 test/nptl/tst-rwlock10.c            |   20 -
 test/nptl/tst-rwlock11.c            |   20 -
 test/nptl/tst-rwlock12.c            |  207 ---
 test/nptl/tst-rwlock13.c            |   70 -
 test/nptl/tst-rwlock14.c            |  168 ---
 test/nptl/tst-rwlock2.c             |  142 ---
 test/nptl/tst-rwlock2a.c            |    2 -
 test/nptl/tst-rwlock3.c             |   92 --
 test/nptl/tst-rwlock4.c             |  189 ---
 test/nptl/tst-rwlock5.c             |   86 --
 test/nptl/tst-rwlock6.c             |  225 ----
 test/nptl/tst-rwlock7.c             |  178 ---
 test/nptl/tst-rwlock8.c             |  163 ---
 test/nptl/tst-rwlock9.c             |  202 ---
 test/nptl/tst-sched1.c              |   97 --
 test/nptl/tst-sem1.c                |   88 --
 test/nptl/tst-sem10.c               |   87 --
 test/nptl/tst-sem11.c               |   76 --
 test/nptl/tst-sem12.c               |   14 -
 test/nptl/tst-sem2.c                |   53 -
 test/nptl/tst-sem3.c                |  144 ---
 test/nptl/tst-sem4.c                |  149 ---
 test/nptl/tst-sem5.c                |   79 --
 test/nptl/tst-sem6.c                |   80 --
 test/nptl/tst-sem7.c                |  108 --
 test/nptl/tst-sem8.c                |   73 --
 test/nptl/tst-sem9.c                |   80 --
 test/nptl/tst-signal1.c             |  188 ---
 test/nptl/tst-signal2.c             |  197 ---
 test/nptl/tst-signal3.c             |  260 ----
 test/nptl/tst-signal4.c             |   59 -
 test/nptl/tst-signal5.c             |  110 --
 test/nptl/tst-signal6.c             |  191 ---
 test/nptl/tst-signal7.c             |   58 -
 test/nptl/tst-spin1.c               |   56 -
 test/nptl/tst-spin2.c               |  158 ---
 test/nptl/tst-spin3.c               |   54 -
 test/nptl/tst-stack-align.h         |   34 -
 test/nptl/tst-stack1.c              |  145 ---
 test/nptl/tst-stack2.c              |   79 --
 test/nptl/tst-stdio1.c              |   56 -
 test/nptl/tst-stdio2.c              |   81 --
 test/nptl/tst-sysconf.c             |   47 -
 test/nptl/tst-timer2.c              |   65 -
 test/nptl/tst-timer3.c              |   86 --
 test/nptl/tst-timer4.c              |  647 ----------
 test/nptl/tst-timer5.c              |   38 -
 test/nptl/tst-tls1.c                |  121 --
 test/nptl/tst-tls2.c                |  215 ----
 test/nptl/tst-tls3.c                |  224 ----
 test/nptl/tst-tls3mod.c             |  105 --
 test/nptl/tst-tls4.c                |  190 ---
 test/nptl/tst-tls4moda.c            |   55 -
 test/nptl/tst-tls4modb.c            |   64 -
 test/nptl/tst-tls5.c                |  118 --
 test/nptl/tst-tls5.h                |   28 -
 test/nptl/tst-tls5mod.c             |    6 -
 test/nptl/tst-tls5moda.c            |    6 -
 test/nptl/tst-tls5modb.c            |    6 -
 test/nptl/tst-tls5modc.c            |    6 -
 test/nptl/tst-tls5modd.c            |    6 -
 test/nptl/tst-tls5mode.c            |    8 -
 test/nptl/tst-tls5modf.c            |    9 -
 test/nptl/tst-tsd1.c                |  117 --
 test/nptl/tst-tsd2.c                |   96 --
 test/nptl/tst-tsd3.c                |  128 --
 test/nptl/tst-tsd4.c                |  102 --
 test/nptl/tst-tsd5.c                |   80 --
 test/nptl/tst-tsd6.c                |   89 --
 test/nptl/tst-typesizes.c           |   95 --
 test/nptl/tst-umask1.c              |  136 --
 test/nptl/tst-unload.c              |   46 -
 test/nptl/tst-vfork1.c              |  149 ---
 test/nptl/tst-vfork1x.c             |  149 ---
 test/nptl/tst-vfork2.c              |  198 ---
 test/nptl/tst-vfork2x.c             |  198 ---
 259 files changed, 31953 deletions(-)
 delete mode 100644 test/nptl/Makefile
 delete mode 100644 test/nptl/Makefile.in
 delete mode 100644 test/nptl/eintr.c
 delete mode 100644 test/nptl/tst-align.c
 delete mode 100644 test/nptl/tst-align2.c
 delete mode 100644 test/nptl/tst-align3.c
 delete mode 100644 test/nptl/tst-atfork1.c
 delete mode 100644 test/nptl/tst-atfork2.c
 delete mode 100644 test/nptl/tst-atfork2mod.c
 delete mode 100644 test/nptl/tst-attr1.c
 delete mode 100644 test/nptl/tst-attr2.c
 delete mode 100644 test/nptl/tst-attr3.c
 delete mode 100644 test/nptl/tst-barrier1.c
 delete mode 100644 test/nptl/tst-barrier2.c
 delete mode 100644 test/nptl/tst-barrier3.c
 delete mode 100644 test/nptl/tst-barrier4.c
 delete mode 100644 test/nptl/tst-basic1.c
 delete mode 100644 test/nptl/tst-basic2.c
 delete mode 100644 test/nptl/tst-basic3.c
 delete mode 100644 test/nptl/tst-basic4.c
 delete mode 100644 test/nptl/tst-basic5.c
 delete mode 100644 test/nptl/tst-basic6.c
 delete mode 100644 test/nptl/tst-basic7.c
 delete mode 100644 test/nptl/tst-cancel1.c
 delete mode 100644 test/nptl/tst-cancel10.c
 delete mode 100644 test/nptl/tst-cancel11.c
 delete mode 100644 test/nptl/tst-cancel12.c
 delete mode 100644 test/nptl/tst-cancel13.c
 delete mode 100644 test/nptl/tst-cancel14.c
 delete mode 100644 test/nptl/tst-cancel15.c
 delete mode 100644 test/nptl/tst-cancel16.c
 delete mode 100644 test/nptl/tst-cancel18.c
 delete mode 100644 test/nptl/tst-cancel19.c
 delete mode 100644 test/nptl/tst-cancel2.c
 delete mode 100644 test/nptl/tst-cancel20.c
 delete mode 100644 test/nptl/tst-cancel21.c
 delete mode 100644 test/nptl/tst-cancel22.c
 delete mode 100644 test/nptl/tst-cancel23.c
 delete mode 100644 test/nptl/tst-cancel25.c
 delete mode 100644 test/nptl/tst-cancel3.c
 delete mode 100644 test/nptl/tst-cancel4.c
 delete mode 100644 test/nptl/tst-cancel5.c
 delete mode 100644 test/nptl/tst-cancel6.c
 delete mode 100644 test/nptl/tst-cancel7.c
 delete mode 100644 test/nptl/tst-cancel8.c
 delete mode 100644 test/nptl/tst-cancel9.c
 delete mode 100644 test/nptl/tst-cancelx10.c
 delete mode 100644 test/nptl/tst-cancelx11.c
 delete mode 100644 test/nptl/tst-cancelx12.c
 delete mode 100644 test/nptl/tst-cancelx13.c
 delete mode 100644 test/nptl/tst-cancelx14.c
 delete mode 100644 test/nptl/tst-cancelx15.c
 delete mode 100644 test/nptl/tst-cancelx16.c
 delete mode 100644 test/nptl/tst-cancelx18.c
 delete mode 100644 test/nptl/tst-cancelx2.c
 delete mode 100644 test/nptl/tst-cancelx20.c
 delete mode 100644 test/nptl/tst-cancelx21.c
 delete mode 100644 test/nptl/tst-cancelx3.c
 delete mode 100644 test/nptl/tst-cancelx4.c
 delete mode 100644 test/nptl/tst-cancelx6.c
 delete mode 100644 test/nptl/tst-cancelx7.c
 delete mode 100644 test/nptl/tst-cancelx8.c
 delete mode 100644 test/nptl/tst-cancelx9.c
 delete mode 100644 test/nptl/tst-cleanup0.c
 delete mode 100644 test/nptl/tst-cleanup1.c
 delete mode 100644 test/nptl/tst-cleanup2.c
 delete mode 100644 test/nptl/tst-cleanup3.c
 delete mode 100644 test/nptl/tst-cleanup4.c
 delete mode 100644 test/nptl/tst-cleanup4aux.c
 delete mode 100644 test/nptl/tst-cleanupx0.c
 delete mode 100644 test/nptl/tst-cleanupx1.c
 delete mode 100644 test/nptl/tst-cleanupx2.c
 delete mode 100644 test/nptl/tst-cleanupx3.c
 delete mode 100644 test/nptl/tst-cleanupx4.c
 delete mode 100644 test/nptl/tst-clock.c
 delete mode 100644 test/nptl/tst-clock1.c
 delete mode 100644 test/nptl/tst-clock2.c
 delete mode 100644 test/nptl/tst-clock_nanosleep.c
 delete mode 100644 test/nptl/tst-cond-deadlock.c
 delete mode 100644 test/nptl/tst-cond1.c
 delete mode 100644 test/nptl/tst-cond10.c
 delete mode 100644 test/nptl/tst-cond11.c
 delete mode 100644 test/nptl/tst-cond12.c
 delete mode 100644 test/nptl/tst-cond13.c
 delete mode 100644 test/nptl/tst-cond14.c
 delete mode 100644 test/nptl/tst-cond15.c
 delete mode 100644 test/nptl/tst-cond16.c
 delete mode 100644 test/nptl/tst-cond17.c
 delete mode 100644 test/nptl/tst-cond18.c
 delete mode 100644 test/nptl/tst-cond19.c
 delete mode 100644 test/nptl/tst-cond2.c
 delete mode 100644 test/nptl/tst-cond20.c
 delete mode 100644 test/nptl/tst-cond21.c
 delete mode 100644 test/nptl/tst-cond22.c
 delete mode 100644 test/nptl/tst-cond23.c
 delete mode 100644 test/nptl/tst-cond3.c
 delete mode 100644 test/nptl/tst-cond4.c
 delete mode 100644 test/nptl/tst-cond5.c
 delete mode 100644 test/nptl/tst-cond6.c
 delete mode 100644 test/nptl/tst-cond7.c
 delete mode 100644 test/nptl/tst-cond8.c
 delete mode 100644 test/nptl/tst-cond9.c
 delete mode 100644 test/nptl/tst-cpuclock1.c
 delete mode 100644 test/nptl/tst-cpuclock2.c
 delete mode 100644 test/nptl/tst-cputimer1.c
 delete mode 100644 test/nptl/tst-cputimer2.c
 delete mode 100644 test/nptl/tst-cputimer3.c
 delete mode 100644 test/nptl/tst-detach1.c
 delete mode 100644 test/nptl/tst-dlsym1.c
 delete mode 100644 test/nptl/tst-eintr1.c
 delete mode 100644 test/nptl/tst-eintr2.c
 delete mode 100644 test/nptl/tst-eintr3.c
 delete mode 100644 test/nptl/tst-eintr4.c
 delete mode 100644 test/nptl/tst-eintr5.c
 delete mode 100644 test/nptl/tst-exec2.c
 delete mode 100644 test/nptl/tst-exec3.c
 delete mode 100644 test/nptl/tst-exec4.c
 delete mode 100644 test/nptl/tst-exit1.c
 delete mode 100644 test/nptl/tst-exit2.c
 delete mode 100644 test/nptl/tst-exit3.c
 delete mode 100644 test/nptl/tst-fini1.c
 delete mode 100644 test/nptl/tst-fini1mod.c
 delete mode 100644 test/nptl/tst-flock1.c
 delete mode 100644 test/nptl/tst-flock2.c
 delete mode 100644 test/nptl/tst-fork1.c
 delete mode 100644 test/nptl/tst-fork2.c
 delete mode 100644 test/nptl/tst-fork3.c
 delete mode 100644 test/nptl/tst-fork4.c
 delete mode 100644 test/nptl/tst-getpid1.c
 delete mode 100644 test/nptl/tst-getpid2.c
 delete mode 100644 test/nptl/tst-getpid3.c
 delete mode 100644 test/nptl/tst-initializers1-c89.c
 delete mode 100644 test/nptl/tst-initializers1-c99.c
 delete mode 100644 test/nptl/tst-initializers1-gnu89.c
 delete mode 100644 test/nptl/tst-initializers1-gnu99.c
 delete mode 100644 test/nptl/tst-initializers1.c
 delete mode 100644 test/nptl/tst-join1.c
 delete mode 100644 test/nptl/tst-join2.c
 delete mode 100644 test/nptl/tst-join3.c
 delete mode 100644 test/nptl/tst-join4.c
 delete mode 100644 test/nptl/tst-join5.c
 delete mode 100644 test/nptl/tst-join6.c
 delete mode 100644 test/nptl/tst-key1.c
 delete mode 100644 test/nptl/tst-key2.c
 delete mode 100644 test/nptl/tst-key3.c
 delete mode 100644 test/nptl/tst-key4.c
 delete mode 100644 test/nptl/tst-kill1.c
 delete mode 100644 test/nptl/tst-kill2.c
 delete mode 100644 test/nptl/tst-kill3.c
 delete mode 100644 test/nptl/tst-kill4.c
 delete mode 100644 test/nptl/tst-kill5.c
 delete mode 100644 test/nptl/tst-kill6.c
 delete mode 100644 test/nptl/tst-mqueue.h
 delete mode 100644 test/nptl/tst-mqueue1.c
 delete mode 100644 test/nptl/tst-mqueue2.c
 delete mode 100644 test/nptl/tst-mqueue3.c
 delete mode 100644 test/nptl/tst-mqueue4.c
 delete mode 100644 test/nptl/tst-mqueue5.c
 delete mode 100644 test/nptl/tst-mqueue6.c
 delete mode 100644 test/nptl/tst-mqueue7.c
 delete mode 100644 test/nptl/tst-mqueue8.c
 delete mode 100644 test/nptl/tst-mqueue9.c
 delete mode 100644 test/nptl/tst-mutex1.c
 delete mode 100644 test/nptl/tst-mutex2.c
 delete mode 100644 test/nptl/tst-mutex3.c
 delete mode 100644 test/nptl/tst-mutex4.c
 delete mode 100644 test/nptl/tst-mutex5.c
 delete mode 100644 test/nptl/tst-mutex5a.c
 delete mode 100644 test/nptl/tst-mutex6.c
 delete mode 100644 test/nptl/tst-mutex7.c
 delete mode 100644 test/nptl/tst-mutex7a.c
 delete mode 100644 test/nptl/tst-mutex8.c
 delete mode 100644 test/nptl/tst-mutex9.c
 delete mode 100644 test/nptl/tst-oddstacklimit.c
 delete mode 100644 test/nptl/tst-once1.c
 delete mode 100644 test/nptl/tst-once2.c
 delete mode 100644 test/nptl/tst-once3.c
 delete mode 100644 test/nptl/tst-once4.c
 delete mode 100644 test/nptl/tst-oncex3.c
 delete mode 100644 test/nptl/tst-oncex4.c
 delete mode 100644 test/nptl/tst-popen1.c
 delete mode 100644 test/nptl/tst-raise1.c
 delete mode 100644 test/nptl/tst-rwlock1.c
 delete mode 100644 test/nptl/tst-rwlock10.c
 delete mode 100644 test/nptl/tst-rwlock11.c
 delete mode 100644 test/nptl/tst-rwlock12.c
 delete mode 100644 test/nptl/tst-rwlock13.c
 delete mode 100644 test/nptl/tst-rwlock14.c
 delete mode 100644 test/nptl/tst-rwlock2.c
 delete mode 100644 test/nptl/tst-rwlock2a.c
 delete mode 100644 test/nptl/tst-rwlock3.c
 delete mode 100644 test/nptl/tst-rwlock4.c
 delete mode 100644 test/nptl/tst-rwlock5.c
 delete mode 100644 test/nptl/tst-rwlock6.c
 delete mode 100644 test/nptl/tst-rwlock7.c
 delete mode 100644 test/nptl/tst-rwlock8.c
 delete mode 100644 test/nptl/tst-rwlock9.c
 delete mode 100644 test/nptl/tst-sched1.c
 delete mode 100644 test/nptl/tst-sem1.c
 delete mode 100644 test/nptl/tst-sem10.c
 delete mode 100644 test/nptl/tst-sem11.c
 delete mode 100644 test/nptl/tst-sem12.c
 delete mode 100644 test/nptl/tst-sem2.c
 delete mode 100644 test/nptl/tst-sem3.c
 delete mode 100644 test/nptl/tst-sem4.c
 delete mode 100644 test/nptl/tst-sem5.c
 delete mode 100644 test/nptl/tst-sem6.c
 delete mode 100644 test/nptl/tst-sem7.c
 delete mode 100644 test/nptl/tst-sem8.c
 delete mode 100644 test/nptl/tst-sem9.c
 delete mode 100644 test/nptl/tst-signal1.c
 delete mode 100644 test/nptl/tst-signal2.c
 delete mode 100644 test/nptl/tst-signal3.c
 delete mode 100644 test/nptl/tst-signal4.c
 delete mode 100644 test/nptl/tst-signal5.c
 delete mode 100644 test/nptl/tst-signal6.c
 delete mode 100644 test/nptl/tst-signal7.c
 delete mode 100644 test/nptl/tst-spin1.c
 delete mode 100644 test/nptl/tst-spin2.c
 delete mode 100644 test/nptl/tst-spin3.c
 delete mode 100644 test/nptl/tst-stack-align.h
 delete mode 100644 test/nptl/tst-stack1.c
 delete mode 100644 test/nptl/tst-stack2.c
 delete mode 100644 test/nptl/tst-stdio1.c
 delete mode 100644 test/nptl/tst-stdio2.c
 delete mode 100644 test/nptl/tst-sysconf.c
 delete mode 100644 test/nptl/tst-timer2.c
 delete mode 100644 test/nptl/tst-timer3.c
 delete mode 100644 test/nptl/tst-timer4.c
 delete mode 100644 test/nptl/tst-timer5.c
 delete mode 100644 test/nptl/tst-tls1.c
 delete mode 100644 test/nptl/tst-tls2.c
 delete mode 100644 test/nptl/tst-tls3.c
 delete mode 100644 test/nptl/tst-tls3mod.c
 delete mode 100644 test/nptl/tst-tls4.c
 delete mode 100644 test/nptl/tst-tls4moda.c
 delete mode 100644 test/nptl/tst-tls4modb.c
 delete mode 100644 test/nptl/tst-tls5.c
 delete mode 100644 test/nptl/tst-tls5.h
 delete mode 100644 test/nptl/tst-tls5mod.c
 delete mode 100644 test/nptl/tst-tls5moda.c
 delete mode 100644 test/nptl/tst-tls5modb.c
 delete mode 100644 test/nptl/tst-tls5modc.c
 delete mode 100644 test/nptl/tst-tls5modd.c
 delete mode 100644 test/nptl/tst-tls5mode.c
 delete mode 100644 test/nptl/tst-tls5modf.c
 delete mode 100644 test/nptl/tst-tsd1.c
 delete mode 100644 test/nptl/tst-tsd2.c
 delete mode 100644 test/nptl/tst-tsd3.c
 delete mode 100644 test/nptl/tst-tsd4.c
 delete mode 100644 test/nptl/tst-tsd5.c
 delete mode 100644 test/nptl/tst-tsd6.c
 delete mode 100644 test/nptl/tst-typesizes.c
 delete mode 100644 test/nptl/tst-umask1.c
 delete mode 100644 test/nptl/tst-unload.c
 delete mode 100644 test/nptl/tst-vfork1.c
 delete mode 100644 test/nptl/tst-vfork1x.c
 delete mode 100644 test/nptl/tst-vfork2.c
 delete mode 100644 test/nptl/tst-vfork2x.c

(limited to 'test/nptl')

diff --git a/test/nptl/Makefile b/test/nptl/Makefile
deleted file mode 100644
index c22b635b7..000000000
--- a/test/nptl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# uClibc NPTL tests
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-
-top_builddir=../../
-top_srcdir=../../
-include ../Rules.mak
--include Makefile.in
-include ../Test.mak
diff --git a/test/nptl/Makefile.in b/test/nptl/Makefile.in
deleted file mode 100644
index 9a3b10489..000000000
--- a/test/nptl/Makefile.in
+++ /dev/null
@@ -1,242 +0,0 @@
-# uClibc NPTL tests
-# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-
-TESTS := tst-align tst-align2 tst-atfork1 tst-attr1 tst-attr2 tst-attr3	\
-	tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 tst-basic1	\
-	tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6		\
-	tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel6 tst-cancel7	\
-	tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 tst-cancel12	\
-	tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel16		\
-	tst-cancel19 tst-cancel20 tst-cancel21 tst-cancel22		\
-	tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3		\
-	tst-cleanup4 tst-clock1 tst-clock2 tst-cond1 tst-cond2		\
-	tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 tst-cond8	\
-	tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13		\
-	tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18		\
-	tst-cond19 tst-cond20 tst-cond21 tst-detach1 tst-eintr1		\
-	tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 tst-exec2 tst-exec3	\
-	tst-exec4 tst-exit1 tst-exit2 tst-exit3 tst-flock1 tst-flock2	\
-	tst-fork1 tst-fork2 tst-fork3 tst-fork4 tst-initializers1	\
-	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-key1	\
-	tst-key2 tst-key3 tst-key4 tst-kill1 tst-kill2 tst-kill3	\
-	tst-kill4 tst-kill5 tst-kill6 tst-mutex1 tst-mutex2 tst-mutex3	\
-	tst-mutex4 tst-mutex5 tst-mutex6 tst-mutex7 tst-mutex8		\
-	tst-mutex9 tst-mutex5a tst-mutex7a tst-once1 tst-once2		\
-	tst-once3 tst-once4 tst-popen1 tst-raise1 tst-rwlock1		\
-	tst-rwlock2 tst-rwlock3 tst-rwlock4 tst-rwlock5 tst-rwlock6	\
-	tst-rwlock7 tst-rwlock8 tst-rwlock9 tst-rwlock10 tst-rwlock11	\
-	tst-rwlock12 tst-rwlock13 tst-rwlock14 tst-sched1 tst-sem1	\
-	tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 tst-sem8	\
-	tst-sem9 tst-signal1 tst-signal2 tst-signal3 tst-signal4	\
-	tst-signal5 tst-signal6 tst-spin1 tst-spin2 tst-spin3		\
-	tst-stack1 tst-stack2 tst-stdio1 tst-stdio2 tst-sysconf		\
-	tst-tls1 tst-tls2 tst-tls3 tst-tls4 tst-tls5 tst-tsd1 tst-tsd2	\
-	tst-tsd3 tst-tsd4 tst-tsd5 tst-umask1 tst-cond-deadlock \
-	tst-align3 tst-cancel4 tst-cancel5 tst-cancel18 tst-cancel23 \
-	tst-cancel25 tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx6 \
-	tst-cancelx7 tst-cancelx8 tst-cancelx9 tst-cancelx10 tst-cancelx11 \
-	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-getpid1 tst-getpid2 tst-getpid3 tst-join6 tst-tsd6 \
-	tst-oddstacklimit tst-oncex3 tst-oncex4 tst-rwlock2a  \
-	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 \
-	tst-atfork2
-
-#
-# These are for the RT library and POSIX timers.
-#
-TESTS += tst-clock tst-clock_nanosleep tst-cpuclock1 tst-cpuclock2	\
-	tst-cputimer1 tst-cputimer2 tst-cputimer3 tst-mqueue1		\
-	tst-mqueue2 tst-mqueue3 tst-mqueue4 tst-mqueue5 tst-mqueue6	\
-	tst-mqueue7 tst-mqueue8 tst-mqueue9 tst-timer2 tst-timer3	\
-	tst-timer4 tst-timer5
-
-ifeq ($(UCLIBC_HAS_OBSOLETE_BSD_SIGNAL),)
-TESTS_DISABLED += tst-exec2 tst-exec3 tst-exec4
-endif
-
-ifeq ($(UCLIBC_SUSV4_LEGACY),)
-TESTS_DISABLED += tst-basic5 tst-cancel4 tst-cancel5 tst-cancelx4
-endif
-
-GLIBC_TESTS_DISABLED := tst-eintr1_glibc tst-eintr2_glibc \
-	tst-eintr3_glibc tst-eintr4_glibc tst-eintr5_glibc \
-	tst-tls1_glibc tst-tls2_glibc
-
-
-ifeq ($(HAVE_SHARED),)
-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
-
-EXTRA_CFLAGS := -DNOT_IN_libc=1 -D_LIBC -D__USE_GNU -std=gnu99 \
-	$(PTINC) \
-	-I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \
-	-I$(top_srcdir)libc/sysdeps/linux \
-	-I$(top_builddir)include \
-	-include $(top_builddir)include/libc-symbols.h
-
-ifeq ($(TARGET_ARCH),i386)
-CFLAGS_tst-align := -malign-double -mpreferred-stack-boundary=4
-endif
-ifeq ($(TARGET_ARCH),i686)
-CFLAGS_tst-align := -malign-double -mpreferred-stack-boundary=4 -msse
-endif
-CFLAGS_tst-cleanup4aux.o := -W
-CFLAGS_tst-initializers1 := -W -Werror
-CFLAGS_tst-tls3mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls4moda.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls4modb.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5moda.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5modb.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5modc.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5modd.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5mode.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-CFLAGS_tst-tls5modf.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-
-CFLAGS_tst-fini1mod.so := -fPIC -DPIC -DSHARED -shared -DNOT_IN_libc
-LDFLAGS_tst-cond11 = -lrt
-LDFLAGS_tst-cond19 = -lrt
-
-LDFLAGS_tst-cancelx2 = -lc
-LDFLAGS_tst-cancelx3 = -lc
-LDFLAGS_tst-cancelx4 = -lc
-LDFLAGS_tst-cancelx6 = -lc
-LDFLAGS_tst-cancelx6 = -lc
-LDFLAGS_tst-cancelx7 = -lc
-LDFLAGS_tst-cancelx8 = -lc
-LDFLAGS_tst-cancelx9 = -lc
-LDFLAGS_tst-cancelx10 = -lc
-LDFLAGS_tst-cancelx11 = -lc
-LDFLAGS_tst-cancelx12 = -lc
-LDFLAGS_tst-cancelx13 = -lc
-LDFLAGS_tst-cancelx14 = -lc
-LDFLAGS_tst-cancelx15 = -lc
-LDFLAGS_tst-cancelx16 = -lc
-LDFLAGS_tst-cancelx18 = -lc
-LDFLAGS_tst-cancelx20 = -lc
-LDFLAGS_tst-cancelx21 = -lc
-LDFLAGS_tst-cleanupx0 = -lc
-LDFLAGS_tst-cleanupx1 = -lc
-LDFLAGS_tst-cleanupx2 = -lc
-LDFLAGS_tst-cleanupx3 = -lc
-LDFLAGS_tst-oncex3 = -lc
-LDFLAGS_tst-oncex4 = -lc
-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
-LDFLAGS_tst-cancel23 := -lc -lpthread
-LDFLAGS_tst-vfork1x := -lc -lpthread
-LDFLAGS_tst-vfork2x := -lc -lpthread
-
-CFLAGS_tst-cancelx2 += -fexceptions
-CFLAGS_tst-cancelx3 += -fexceptions
-CFLAGS_tst-cancelx4 += -fexceptions
-CFLAGS_tst-cancelx6 += -fexceptions
-CFLAGS_tst-cancelx7 += -fexceptions
-CFLAGS_tst-cancelx8 += -fexceptions
-CFLAGS_tst-cancelx9 += -fexceptions
-CFLAGS_tst-cancelx10 += -fexceptions
-CFLAGS_tst-cancelx11 += -fexceptions
-CFLAGS_tst-cancelx12 += -fexceptions
-CFLAGS_tst-cancelx13 += -fexceptions
-CFLAGS_tst-cancelx14 += -fexceptions
-CFLAGS_tst-cancelx15 += -fexceptions
-CFLAGS_tst-cancelx16 += -fexceptions
-CFLAGS_tst-cancelx18 += -fexceptions
-CFLAGS_tst-cancelx20 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-cancelx21 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-cleanupx0 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-cleanupx1 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-cleanupx2 += -fexceptions
-CFLAGS_tst-cleanupx3 += -fexceptions
-
-CFLAGS_tst-oncex3 += -fexceptions
-CFLAGS_tst-oncex4 += -fexceptions
-CFLAGS_tst-align += $(stack-align-test-flags)
-CFLAGS_tst-align3 += $(stack-align-test-flags)
-CFLAGS_tst-initializers1 = -W -Wall -Werror
-CFLAGS_tst-sem11 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-sem12 += -fexceptions -fasynchronous-unwind-tables
-CFLAGS_tst-initializers1 = -W -Wall -Werror
-CFLAGS_tst-initializers1-c89 = $(CFLAGS-tst-initializers1) -std=c89
-CFLAGS_tst-initializers1-c99 = $(CFLAGS-tst-initializers1) -std=c99
-CFLAGS_tst-initializers1-gnu89 = $(CFLAGS-tst-initializers1) -std=gnu89
-CFLAGS_tst-initializers1-gnu99 = $(CFLAGS-tst-initializers1) -std=gnu99
-
-EXTRA_LDFLAGS = $(if $(findstring -lpthread,$(LDFLAGS_$@)),,-lpthread)
-
-LDFLAGS_tst-atfork2 := -ldl -rdynamic
-LDFLAGS_tst-atfork2mod.so := -shared -static-libgcc -lpthread
-LDFLAGS_tst-cleanup4 := tst-cleanup4aux.o
-LDFLAGS_tst-cleanupx4 := tst-cleanup4aux.o
-LDFLAGS_tst-clock2 := -lrt
-LDFLAGS_tst-cond11 := -lrt
-LDFLAGS_tst-cond19 := -lrt
-LDFLAGS_tst-rwlock14 := -lrt
-LDFLAGS_tst-tls3 := -ldl -rdynamic
-LDFLAGS_tst-tls4 := -ldl
-LDFLAGS_tst-tls5 :=  tst-tls5mod.so
-LDFLAGS_tst-clock := -lrt
-LDFLAGS_tst-clock_nanosleep := -lrt
-LDFLAGS_tst-cpuclock1 := -lrt
-LDFLAGS_tst-cpuclock2 := -lrt -lpthread
-LDFLAGS_tst-cputimer1 := -lrt -lpthread
-LDFLAGS_tst-cputimer2 := -lrt -lpthread
-LDFLAGS_tst-cputimer3 := -lrt -lpthread
-LDFLAGS_tst-mqueue1 := -lrt
-LDFLAGS_tst-mqueue2 := -lrt
-LDFLAGS_tst-mqueue3 := -lrt -lpthread
-LDFLAGS_tst-mqueue4 := -lrt
-LDFLAGS_tst-mqueue5 := -lrt -lpthread
-LDFLAGS_tst-mqueue6 := -lrt -lpthread
-LDFLAGS_tst-mqueue7 := -lrt
-LDFLAGS_tst-mqueue8 := -lrt
-LDFLAGS_tst-mqueue9 := -lrt
-LDFLAGS_tst-timer2 := -lrt -lpthread
-LDFLAGS_tst-timer3 := -lrt -lpthread
-LDFLAGS_tst-timer4 := -lrt -lpthread
-LDFLAGS_tst-timer5 := -lrt -lpthread
-LDFLAGS_tst-dlsym1 := -ldl -rdynamic
-LDFLAGS_tst-tls3mod.so := -shared -static-libgcc -lpthread
-LDFLAGS_tst-tls4moda.so := -shared -static-libgcc
-LDFLAGS_tst-tls4modb.so := -shared -static-libgcc
-LDFLAGS_tst-tls5mod.so := -shared -static-libgcc -Wl,-soname,tst-tls5mod.so
-LDFLAGS_tst-tls5moda.so := -shared -static-libgcc
-LDFLAGS_tst-tls5modb.so := -shared -static-libgcc
-LDFLAGS_tst-tls5modc.so := -shared -static-libgcc
-LDFLAGS_tst-tls5modd.so := -shared -static-libgcc
-LDFLAGS_tst-tls5mode.so := -shared -static-libgcc
-LDFLAGS_tst-tls5modf.so := -shared -static-libgcc
-LDFLAGS_tst-cleanupx4 := tst-cleanup4aux.o
-
-#
-# Special case
-#
-tst-cleanup4aux.o:
-	$(Q)$(CC) $(CFLAGS) $(CFLAGS_$@) $(EXTRA_CFLAGS) -c tst-cleanup4aux.c -o $@
-
-tst-cleanup4: tst-cleanup4aux.o
-tst-tls3: tst-tls3mod.so
-tst-tls4: tst-tls4moda.so tst-tls4modb.so
-tst-tls5: tst-tls5mod.so
-
-tst-cleanupx4 : tst-cleanup4aux.o
-tst-fini1: tst-fini1mod.so
-
-tst-atfork2: tst-atfork2mod.so
-tst-atfork2_glibc: tst-atfork2mod.so.glibc
-
-OPTS_tst-cancel7 = -c ./tst-cancel7
-OPTS_tst-mqueue7 = -- ./tst-mqueue7
-OPTS_tst-exec4 = ./tst-exec4
-
-WRAPPER := env LD_LIBRARY_PATH="$$PWD:.:$(LD_LIBRARY_PATH)" TIMEOUTFACTOR=10
diff --git a/test/nptl/eintr.c b/test/nptl/eintr.c
deleted file mode 100644
index d6425b51b..000000000
--- a/test/nptl/eintr.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pthread.h>
-#include <signal.h>
-#include <unistd.h>
-
-
-static int the_sig;
-
-
-static void
-eintr_handler (int sig)
-{
-  if (sig != the_sig)
-    {
-      write (STDOUT_FILENO, "eintr_handler: signal number wrong\n", 35);
-      _exit (1);
-    }
-  write (STDOUT_FILENO, ".", 1);
-}
-
-
-static void *
-eintr_source (void *arg)
-{
-  struct timespec ts = { .tv_sec = 0, .tv_nsec = 500000 };
-
-  if (arg == NULL)
-    {
-      sigset_t ss;
-      sigemptyset (&ss);
-      sigaddset (&ss, the_sig);
-      pthread_sigmask (SIG_BLOCK, &ss, NULL);
-    }
-
-  while (1)
-    {
-      if (arg != NULL)
-	pthread_kill (*(pthread_t *) arg, the_sig);
-      else
-	kill (getpid (), the_sig);
-
-      nanosleep (&ts, NULL);
-    }
-
-  /* NOTREACHED */
-  return NULL;
-}
-
-
-static void
-setup_eintr (int sig, pthread_t *thp)
-{
-  struct sigaction sa;
-  sigemptyset (&sa.sa_mask);
-  sa.sa_flags = 0;
-  sa.sa_handler = eintr_handler;
-  if (sigaction (sig, &sa, NULL) != 0)
-    {
-      puts ("setup_eintr: sigaction failed");
-      exit (1);
-    }
-  the_sig = sig;
-
-  /* Create the thread which will fire off the signals.  */
-  pthread_t th;
-  if (pthread_create (&th, NULL, eintr_source, thp) != 0)
-    {
-      puts ("setup_eintr: pthread_create failed");
-      exit (1);
-    }
-}
diff --git a/test/nptl/tst-align.c b/test/nptl/tst-align.c
deleted file mode 100644
index df66b38b7..000000000
--- a/test/nptl/tst-align.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include "tst-stack-align.h"
-
-static void *
-tf (void *arg)
-{
-  bool ok = true;
-
-  puts ("in thread");
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-
-  return ok ? NULL : (void *) -1l;
-}
-
-static int
-do_test (void)
-{
-  bool ok = true;
-
-  puts ("in main");
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-
-  pthread_t th;
-  if (pthread_create (&th, NULL, tf, NULL) != 0)
-    {
-      puts ("create failed");
-      return 1;
-    }
-
-  void *res;
-  if (pthread_join (th, &res) != 0)
-    {
-      puts ("join failed");
-      return 1;
-    }
-
-  if (res != NULL)
-    ok = false;
-
-  return ok ? 0 : 1;
-}
-
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-align2.c b/test/nptl/tst-align2.c
deleted file mode 100644
index 7d3a09913..000000000
--- a/test/nptl/tst-align2.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Copyright (C) 2004 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sched.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include "tst-stack-align.h"
-
-static int
-f (void *arg)
-{
-  bool ok = true;
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-
-  return ok ? 0 : 1;
-}
-
-static int
-do_test (void)
-{
-  bool ok = true;
-
-  puts ("in main");
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-
-#ifdef __ia64__
-  extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
-		       size_t __child_stack_size, int __flags,
-		       void *__arg, ...);
-  char st[256 * 1024];
-  pid_t p = __clone2 (f, st, sizeof (st), 0, 0);
-#else
-  char st[128 * 1024];
-  pid_t p = clone (f, st + sizeof (st), 0, 0);
-#endif
-  if (p == -1)
-    {
-      printf("clone failed: %m\n");
-      return 1;
-    }
-
-  int e;
-  if (waitpid (p, &e, __WCLONE) != p)
-    {
-      puts ("waitpid failed");
-      kill (p, SIGKILL);
-      return 1;
-    }
-  if (!WIFEXITED (e))
-    {
-      if (WIFSIGNALED (e))
-	printf ("died from signal %s\n", strsignal (WTERMSIG (e)));
-      else
-	puts ("did not terminate correctly");
-      return 1;
-    }
-  if (WEXITSTATUS (e) != 0)
-    ok = false;
-
-  return ok ? 0 : 1;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-align3.c b/test/nptl/tst-align3.c
deleted file mode 100644
index fb0a8e4ec..000000000
--- a/test/nptl/tst-align3.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright (C) 2005 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2005.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pthread.h>
-#include <stdbool.h>
-#include <stdint.h>
-#include <stdio.h>
-#include "tst-stack-align.h"
-
-static bool ok = true;
-static pthread_once_t once = PTHREAD_ONCE_INIT;
-
-static void
-once_test (void)
-{
-  puts ("in once_test");
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-}
-
-static int
-do_test (void)
-{
-  puts ("in main");
-
-  if (TEST_STACK_ALIGN ())
-    ok = false;
-
-  if (pthread_once (&once, once_test))
-    {
-      puts ("pthread once failed");
-      return 1;
-    }
-
-  return ok ? 0 : 1;
-}
-
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-atfork1.c b/test/nptl/tst-atfork1.c
deleted file mode 100644
index 129893747..000000000
--- a/test/nptl/tst-atfork1.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-
-static int val;
-
-
-static void
-prepare1 (void)
-{
-  val *= 2;
-}
-
-static void
-prepare2 (void)
-{
-  ++val;
-}
-
-static void
-parent1 (void)
-{
-  val += 4;
-}
-
-static void
-parent2 (void)
-{
-  val *= 4;
-}
-
-static void
-child1 (void)
-{
-  val += 8;
-}
-
-static void
-child2 (void)
-{
-  val *= 8;
-}
-
-
-static int
-do_test (void)
-{
-  pid_t pid;
-  int status = 0;
-
-  if (pthread_atfork (prepare1, parent1, child1) != 0)
-    {
-      puts ("1st atfork failed");
-      exit (1);
-    }
-  if (pthread_atfork (prepare2, parent2, child2) != 0)
-    {
-      puts ("2nd atfork failed");
-      exit (1);
-    }
-
-  pid = fork ();
-  if (pid == -1)
-    {
-      puts ("fork failed");
-      exit (1);
-    }
-
-  if (pid != 0)
-    {
-      /* Parent.  */
-      if (val != 24)
-	{
-	  printf ("expected val=%d, got %d\n", 24, val);
-	  exit (1);
-	}
-
-      if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
-	{
-	  puts ("waitpid failed");
-	  exit (1);
-	}
-    }
-  else
-    {
-      /* Child.  */
-      if (val != 80)
-	{
-	  printf ("expected val=%d, got %d\n", 80, val);
-	  exit (2);
-	}
-    }
-
-  return status;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-atfork2.c b/test/nptl/tst-atfork2.c
deleted file mode 100644
index 594f56ef3..000000000
--- a/test/nptl/tst-atfork2.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* Copyright (C) 2003-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-
-/* Must be exported.  */
-int val;
-
-static void
-prepare (void)
-{
-  val *= 2;
-}
-
-static void
-parent (void)
-{
-  val += 4;
-}
-
-static void
-child (void)
-{
-  val += 8;
-}
-
-
-static int
-do_test (void)
-{
-
-  if (pthread_atfork (prepare, parent, child) != 0)
-    {
-      puts ("do_test: atfork failed");
-      exit (1);
-    }
-
-  void *h = dlopen ("tst-atfork2mod.so", RTLD_LAZY);
-  if (h == NULL)
-    {
-      printf ("dlopen failed: %s\n", dlerror ());
-      exit (1);
-    }
-
-  /* First trial of fork.  */
-  pid_t pid = fork ();
-  if (pid == -1)
-    {
-      puts ("1st fork failed");
-      exit (1);
-    }
-
-  if (pid == 0)
-    {
-      /* Child.  */
-      if (val != 80)
-	{
-	  printf ("1st: expected val=%d, got %d\n", 80, val);
-	  exit (2);
-	}
-
-      exit (0);
-    }
-
-  /* Parent.  */
-  if (val != 24)
-    {
-      printf ("1st: expected val=%d, got %d\n", 24, val);
-      exit (1);
-    }
-
-  int status;
-  if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
-    {
-      puts ("1st waitpid failed");
-      exit (1);
-    }
-
-  if (status != 0)
-    exit (status);
-
-  puts ("unloading now");
-
-  /* Unload the module.  */
-  if (dlclose (h) != 0)
-    {
-      puts ("dlclose failed");
-      exit (1);
-    }
-
-  puts ("2nd fork");
-
-  /* Second fork trial.   */
-  val = 1;
-  pid = fork ();
-  if (pid == -1)
-    {
-      puts ("2nd fork failed");
-      exit (1);
-    }
-
-  if (pid == 0)
-    {
-      /* Child.  */
-      if (val != 10)
-	{
-	  printf ("2nd: expected val=%d, got %d\n", 10, val);
-	  exit (3);
-	}
-
-      exit (0);
-    }
-
-  /* Parent.  */
-  if (val != 6)
-    {
-      printf ("2nd: expected val=%d, got %d\n", 6, val);
-      exit (1);
-    }
-
-  if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
-    {
-      puts ("2nd waitpid failed");
-      exit (1);
-    }
-
-  if (status != 0)
-    exit (status);
-
-  return 0;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-atfork2mod.c b/test/nptl/tst-atfork2mod.c
deleted file mode 100644
index 7c592b471..000000000
--- a/test/nptl/tst-atfork2mod.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright (C) 2003-2016 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-extern int val;
-
-
-static void
-prepare (void)
-{
-  ++val;
-}
-
-static void
-parent (void)
-{
-  val *= 4;
-}
-
-static void
-child (void)
-{
-  val *= 8;
-}
-
-static void
-__attribute__ ((constructor))
-init (void)
-{
-  extern void *__dso_handle;
-  printf ("dsohandle = %p\n", __dso_handle);
-
-  if (pthread_atfork (prepare, parent, child) != 0)
-    {
-      puts ("init: atfork failed");
-      exit (1);
-    }
-}
diff --git a/test/nptl/tst-attr1.c b/test/nptl/tst-attr1.c
deleted file mode 100644
index 987f87ff5..000000000
--- a/test/nptl/tst-attr1.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-
-int
-do_test (void)
-{
-  int i;
-  pthread_attr_t a;
-
-  if (pthread_attr_init (&a) != 0)
-    {
-      puts ("attr_init failed");
-      exit (1);
-    }
-
-  pthread_mutexattr_t ma;
-
-  if (pthread_mutexattr_init (&ma) != 0)
-    {
-      puts ("mutexattr_init failed");
-      exit (1);
-    }
-
-  pthread_rwlockattr_t rwa;
-
-  if (pthread_rwlockattr_init (&rwa) != 0)
-    {
-      puts ("rwlockattr_init failed");
-      exit (1);
-    }
-
-  /* XXX Remove if default value is clear.  */
-  pthread_attr_setinheritsched (&a, PTHREAD_INHERIT_SCHED);
-  pthread_attr_setschedpolicy (&a, SCHED_OTHER);
-  pthread_attr_setscope (&a, PTHREAD_SCOPE_SYSTEM);
-
-  for (i = 0; i < 10000; ++i)
-    {
-      long int r = random ();
-
-      if (r != PTHREAD_CREATE_DETACHED && r != PTHREAD_CREATE_JOINABLE)
-	{
-	  int e = pthread_attr_setdetachstate (&a, r);
-
-	  if (e == 0)
-	    {
-	      printf ("attr_setdetachstate with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("attr_setdetachstate didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_attr_getdetachstate (&a, &s) != 0)
-	    {
-	      puts ("attr_getdetachstate failed");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_CREATE_JOINABLE)
-	    {
-	      printf ("\
-detach state changed to %d by invalid setdetachstate call\n", s);
-	      exit (1);
-	    }
-	}
-
-      if (r != PTHREAD_INHERIT_SCHED && r != PTHREAD_EXPLICIT_SCHED)
-	{
-	  int e = pthread_attr_setinheritsched (&a, r);
-
-	  if (e == 0)
-	    {
-	      printf ("attr_setinheritsched with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("attr_setinheritsched didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_attr_getinheritsched (&a, &s) != 0)
-	    {
-	      puts ("attr_getinheritsched failed");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_INHERIT_SCHED)
-	    {
-	      printf ("\
-inheritsched changed to %d by invalid setinheritsched call\n", s);
-	      exit (1);
-	    }
-	}
-
-      if (r != SCHED_OTHER && r != SCHED_RR && r != SCHED_FIFO)
-	{
-	  int e = pthread_attr_setschedpolicy (&a, r);
-
-	  if (e == 0)
-	    {
-	      printf ("attr_setschedpolicy with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("attr_setschedpolicy didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_attr_getschedpolicy (&a, &s) != 0)
-	    {
-	      puts ("attr_getschedpolicy failed");
-	      exit (1);
-	    }
-
-	  if (s != SCHED_OTHER)
-	    {
-	      printf ("\
-schedpolicy changed to %d by invalid setschedpolicy call\n", s);
-	      exit (1);
-	    }
-	}
-
-      if (r != PTHREAD_SCOPE_SYSTEM && r != PTHREAD_SCOPE_PROCESS)
-	{
-	  int e = pthread_attr_setscope (&a, r);
-
-	  if (e == 0)
-	    {
-	      printf ("attr_setscope with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("attr_setscope didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_attr_getscope (&a, &s) != 0)
-	    {
-	      puts ("attr_getscope failed");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_SCOPE_SYSTEM)
-	    {
-	      printf ("\
-contentionscope changed to %d by invalid setscope call\n", s);
-	      exit (1);
-	    }
-	}
-
-      if (r != PTHREAD_PROCESS_PRIVATE && r != PTHREAD_PROCESS_SHARED)
-	{
-	  int e = pthread_mutexattr_setpshared (&ma, r);
-
-	  if (e == 0)
-	    {
-	      printf ("mutexattr_setpshared with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("mutexattr_setpshared didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_mutexattr_getpshared (&ma, &s) != 0)
-	    {
-	      puts ("mutexattr_getpshared failed");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_PROCESS_PRIVATE)
-	    {
-	      printf ("\
-pshared changed to %d by invalid mutexattr_setpshared call\n", s);
-	      exit (1);
-	    }
-
-	  e = pthread_rwlockattr_setpshared (&rwa, r);
-
-	  if (e == 0)
-	    {
-	      printf ("rwlockattr_setpshared with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-	  if (e != EINVAL)
-	    {
-	      puts ("rwlockattr_setpshared didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  if (pthread_rwlockattr_getpshared (&rwa, &s) != 0)
-	    {
-	      puts ("rwlockattr_getpshared failed");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_PROCESS_PRIVATE)
-	    {
-	      printf ("\
-pshared changed to %d by invalid rwlockattr_setpshared call\n", s);
-	      exit (1);
-	    }
-	}
-
-      if (r != PTHREAD_CANCEL_ENABLE && r != PTHREAD_CANCEL_DISABLE)
-	{
-	  int e = pthread_setcancelstate (r, NULL);
-
-	  if (e == 0)
-	    {
-	      printf ("setcancelstate with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-
-	  if (e != EINVAL)
-	    {
-	      puts ("setcancelstate didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &s) != 0)
-	    {
-	      puts ("setcancelstate failed for PTHREAD_CANCEL_ENABLE");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_CANCEL_ENABLE)
-	    {
-	      puts ("invalid setcancelstate changed state");
-	      exit (1);
-	    }
-	}
-
-      if (r != PTHREAD_CANCEL_DEFERRED && r != PTHREAD_CANCEL_ASYNCHRONOUS)
-	{
-	  int e = pthread_setcanceltype (r, NULL);
-
-	  if (e == 0)
-	    {
-	      printf ("setcanceltype with value %ld succeeded\n", r);
-	      exit (1);
-	    }
-
-	  if (e != EINVAL)
-	    {
-	      puts ("setcanceltype didn't return EINVAL");
-	      exit (1);
-	    }
-
-	  int s;
-	  if (pthread_setcanceltype (PTHREAD_CANCEL_DEFERRED, &s) != 0)
-	    {
-	      puts ("setcanceltype failed for PTHREAD_CANCEL_DEFERRED");
-	      exit (1);
-	    }
-
-	  if (s != PTHREAD_CANCEL_DEFERRED)
-	    {
-	      puts ("invalid setcanceltype changed state");
-	      exit (1);
-	    }
-	}
-    }
-
-  return 0;
-}
-
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-attr2.c b/test/nptl/tst-attr2.c
deleted file mode 100644
index e8f9cc986..000000000
--- a/test/nptl/tst-attr2.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Copyright (C) 2003 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-
-int
-do_test (void)
-{
-  pthread_attr_t a;
-
-  if (pthread_attr_init (&a) != 0)
-    {
-      puts ("attr_init failed");
-      exit (1);
-    }
-
-  /* Check default value of detach state.  */
-  int s;
-  if (pthread_attr_getdetachstate (&a, &s) != 0)
-    {
-      puts ("1st attr_getdestachstate failed");
-      exit (1);
-    }
-  if (s != PTHREAD_CREATE_JOINABLE)
-    {
-      printf ("\
-default detach state wrong: %d, expected %d (PTHREAD_CREATE_JOINABLE)\n",
-	      s, PTHREAD_CREATE_JOINABLE);
-      exit (1);
-    }
-
-  int e = pthread_attr_setdetachstate (&a, PTHREAD_CREATE_DETACHED);
-  if (e != 0)
-    {
-      puts ("1st attr_setdetachstate failed");
-      exit (1);
-    }
-  if (pthread_attr_getdetachstate (&a, &s) != 0)
-    {
-      puts ("2nd attr_getdestachstate failed");
-      exit (1);
-    }
-  if (s != PTHREAD_CREATE_DETACHED)
-    {
-      puts ("PTHREAD_CREATE_DETACHED set, but not given back");
-      exit (1);
-    }
-
-  e = pthread_attr_setdetachstate (&a, PTHREAD_CREATE_JOINABLE);
-  if (e != 0)
-    {
-      puts ("2nd attr_setdetachstate failed");
-      exit (1);
-    }
-  if (pthread_attr_getdetachstate (&a, &s) != 0)
-    {
-      puts ("3rd attr_getdestachstate failed");
-      exit (1);
-    }
-  if (s != PTHREAD_CREATE_JOINABLE)
-    {
-      puts ("PTHREAD_CREATE_JOINABLE set, but not given back");
-      exit (1);
-    }
-
-
-  size_t g;
-  if (pthread_attr_getguardsize (&a, &g) != 0)
-    {
-      puts ("1st attr_getguardsize failed");
-      exit (1);
-    }
-  if (g != (size_t) sysconf (_SC_PAGESIZE))
-    {
-      printf ("default guardsize %zu, expected %ld (PAGESIZE)\n",
-	      g, sysconf (_SC_PAGESIZE));
-      exit (1);
-    }
-
-  e = pthread_attr_setguardsize (&a, 0);
-  if (e != 0)
-    {
-      puts ("1st attr_setguardsize failed");
-      exit (1);
-    }
-  if (pthread_attr_getguardsize (&a, &g) != 0)
-    {
-      puts ("2nd attr_getguardsize failed");
-      exit (1);
-    }
-  if (g != 0)
-    {
-      printf ("guardsize set to zero but %zu returned\n", g);
-      exit (1);
-    }
-
-  e = pthread_attr_setguardsize (&a, 1);
-  if (e != 0)
-    {
-      puts ("2nd attr_setguardsize failed");
-      exit (1);
-    }
-  if (pthread_attr_getguardsize (&a, &g) != 0)
-    {
-      puts ("3rd attr_getguardsize failed");
-      exit (1);
-    }
-  if (g != 1)
-    {
-      printf ("guardsize set to 1 but %zu returned\n", g);
-      exit (1);
-    }
-
-
-  if (pthread_attr_getinheritsched (&a, &s) != 0)
-    {
-      puts ("1st attr_getinheritsched failed");
-      exit (1);
-    }
-  /* XXX What is the correct default value.  */
-  if (s != PTHREAD_INHERIT_SCHED && s != PTHREAD_EXPLICIT_SCHED)
-    {
-      puts ("incorrect default value for inheritsched");
-      exit (1);
-    }
-
-  e = pthread_attr_setinheritsched (&a, PTHREAD_EXPLICIT_SCHED);
-  if (e != 0)
-    {
-      puts ("1st attr_setinheritsched failed");
-      exit (1);
-    }
-  if (pthread_attr_getinheritsched (&a, &s) != 0)
-    {
-      puts ("2nd attr_getinheritsched failed");
-      exit (1);
-    }
-  if (s != PTHREAD_EXPLICIT_SCHED)
-    {
-      printf ("inheritsched set to PTHREAD_EXPLICIT_SCHED, but got %d\n", s);
-      exit (1);
-    }
-
-  e = pthread_attr_setinheritsched (&a, PTHREAD_INHERIT_SCHED);
-  if (e != 0)
-    {
-      puts ("2nd attr_setinheritsched failed");
-      exit (1);
-    }
-  if (pthread_attr_getinheritsched (&a, &s) != 0)
-    {
-      puts ("3rd attr_getinheritsched failed");
-      exit (1);
-    }
-  if (s != PTHREAD_INHERIT_SCHED)
-    {
-      printf ("inheritsched set to PTHREAD_INHERIT_SCHED, but got %d\n", s);
-      exit (1);
-    }
-
-
-  if (pthread_attr_getschedpolicy (&a, &s) != 0)
-    {
-      puts ("1st attr_getschedpolicy failed");
-      exit (1);
-    }
-  /* XXX What is the correct default value.  */
-  if (s != SCHED_OTHER && s != SCHED_FIFO && s != SCHED_RR)
-    {
-      puts ("incorrect default value for schedpolicy");
-      exit (1);
-    }
-
-  e = pthread_attr_setschedpolicy (&a, SCHED_RR);
-  if (e != 0)
-    {
-      puts ("1st attr_setschedpolicy failed");
-      exit (1);
-    }
-  if (pthread_attr_getschedpolicy (&a, &s) != 0)
-    {
-      puts ("2nd attr_getschedpolicy failed");
-      exit (1);
-    }
-  if (s != SCHED_RR)
-    {
-      printf ("schedpolicy set to SCHED_RR, but got %d\n", s);
-      exit (1);
-    }
-
-  e = pthread_attr_setschedpolicy (&a, SCHED_FIFO);
-  if (e != 0)
-    {
-      puts ("2nd attr_setschedpolicy failed");
-      exit (1);
-    }
-  if (pthread_attr_getschedpolicy (&a, &s) != 0)
-    {
-      puts ("3rd attr_getschedpolicy failed");
-      exit (1);
-    }
-  if (s != SCHED_FIFO)
-    {
-      printf ("schedpolicy set to SCHED_FIFO, but got %d\n", s);
-      exit (1);
-    }
-
-  e = pthread_attr_setschedpolicy (&a, SCHED_OTHER);
-  if (e != 0)
-    {
-      puts ("3rd attr_setschedpolicy failed");
-      exit (1);
-    }
-  if (pthread_attr_getschedpolicy (&a, &s) != 0)
-    {
-      puts ("4th attr_getschedpolicy failed");
-      exit (1);
-    }
-  if (s != SCHED_OTHER)
-    {
-      printf ("schedpolicy set to SCHED_OTHER, but got %d\n", s);
-      exit (1);
-    }
-
-
-  if (pthread_attr_getscope (&a, &s) != 0)
-    {
-      puts ("1st attr_getscope failed");
-      exit (1);
-    }
-  /* XXX What is the correct default value.  */
-  if (s != PTHREAD_SCOPE_SYSTEM && s != PTHREAD_SCOPE_PROCESS)
-    {
-      puts ("incorrect default value for contentionscope");
-      exit (1);
-    }
-
-  e = pthread_attr_setscope (&a, PTHREAD_SCOPE_PROCESS);
-  if (e != ENOTSUP)
-    {
-      if (e != 0)
-	{
-	  puts ("1st attr_setscope failed");
-	  exit (1);
-	}
-      if (pthread_attr_getscope (&a, &s) != 0)
-	{
-	  puts ("2nd attr_getscope failed");
-	  exit (1);
-	}
-      if (s != PTHREAD_SCOPE_PROCESS)
-	{
-	  printf ("\
-contentionscope set to PTHREAD_SCOPE_PROCESS, but got %d\n", s);
-	  exit (1);
-	}
-    }
-
-  e = pthread_attr_setscope (&a, PTHREAD_SCOPE_SYSTEM);
-  if (e != 0)
-    {
-      puts ("2nd attr_setscope failed");
-      exit (1);
-    }
-  if (pthread_attr_getscope (&a, &s) != 0)
-    {
-      puts ("3rd attr_getscope failed");
-      exit (1);
-    }
-  if (s != PTHREAD_SCOPE_SYSTEM)
-    {
-      printf ("contentionscope set to PTHREAD_SCOPE_SYSTEM, but got %d\n", s);
-      exit (1);
-    }
-
-  char buf[1];
-  e = pthread_attr_setstack (&a, buf, 1);
-  if (e != EINVAL)
-    {
-      puts ("setstack with size 1 did not produce EINVAL");
-      exit (1);
-    }
-
-  e = pthread_attr_setstacksize (&a, 1);
-  if (e != EINVAL)
-    {
-      puts ("setstacksize with size 1 did not produce EINVAL");
-      exit (1);
-    }
-
-  return 0;
-}
-
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
diff --git a/test/nptl/tst-attr3.c b/test/nptl/tst-attr3.c
deleted file mode 100644
index 5ccf9abba..000000000
--- a/test/nptl/tst-attr3.c
+++ /dev/null
@@ -1,419 +0,0 @@
-/* pthread_getattr