[rtems commit] psxhdrs: Reorganize into subdirectories per .h file and rename files

Joel Sherril joel at rtems.org
Thu Feb 12 22:18:32 UTC 2015


Module:    rtems
Branch:    master
Commit:    b57a6a711adb5f6afe6aee57ecc211fd746ea5ab
Changeset: http://git.rtems.org/rtems/commit/?id=b57a6a711adb5f6afe6aee57ecc211fd746ea5ab

Author:    Joel Sherrill <joel.sherrill at oarcorp.com>
Date:      Wed Feb 11 13:59:29 2015 -0600

psxhdrs: Reorganize into subdirectories per .h file and rename files

This is a better organization and makes it clearer which file
is testing which method from which header file.

---

 testsuites/psxtests/psxhdrs/Makefile.am            | 158 ++++++++++++++++++---
 .../pthread_attr_destroy.c}                        |   0
 .../pthread_attr_getdetachstate.c}                 |   0
 .../pthread_attr_getguardsize.c}                   |   0
 .../pthread_attr_getinheritsched.c}                |   0
 .../pthread_attr_getschedparam.c}                  |   0
 .../pthread_attr_getschedpolicy.c}                 |   0
 .../pthread_attr_getscope.c}                       |   0
 .../pthread_attr_getstack.c}                       |   0
 .../pthread_attr_getstackaddr.c}                   |   0
 .../pthread_attr_getstacksize.c}                   |   0
 .../{pthread01.c => pthread/pthread_attr_init.c}   |   0
 .../pthread_attr_setdetachstate.c}                 |   0
 .../pthread_attr_setguardsize.c}                   |   0
 .../pthread_attr_setinheritsched.c}                |   0
 .../pthread_attr_setschedparam.c}                  |   0
 .../pthread_attr_setschedpolicy.c}                 |   0
 .../pthread_attr_setscope.c}                       |   0
 .../pthread_attr_setstack.c}                       |   0
 .../pthread_attr_setstackaddr.c}                   |   0
 .../pthread_attr_setstacksize.c}                   |   0
 .../{pthread28.c => pthread/pthread_cancel.c}      |   0
 .../{pthread32.c => pthread/pthread_cleanup.c}     |   0
 .../{cond10.c => pthread/pthread_cond_broadcast.c} |   0
 .../{cond04.c => pthread/pthread_cond_destroy.c}   |   0
 .../{cond03.c => pthread/pthread_cond_init.c}      |   0
 .../{cond05.c => pthread/pthread_cond_signal.c}    |   0
 .../{cond07.c => pthread/pthread_cond_timedwait.c} |   0
 .../{cond06.c => pthread/pthread_cond_wait.c}      |   0
 .../pthread_condattr_destroy.c}                    |   0
 .../pthread_condattr_getpshared.c}                 |   0
 .../{cond01.c => pthread/pthread_condattr_init.c}  |   0
 .../pthread_condattr_setpshared.c}                 |   0
 .../{pthread07.c => pthread/pthread_create.c}      |   0
 .../{pthread21.c => pthread/pthread_detach.c}      |   0
 .../{pthread10.c => pthread/pthread_equal.c}       |   0
 .../{pthread08.c => pthread/pthread_exit.c}        |   0
 .../pthread_getcpuclockid.c}                       |   0
 .../pthread_getschedparam.c}                       |   0
 .../{key03.c => pthread/pthread_getspecific.c}     |   0
 .../{pthread26.c => pthread/pthread_join.c}        |   0
 .../{key01.c => pthread/pthread_key_create.c}      |   0
 .../{key04.c => pthread/pthread_key_delete.c}      |   0
 .../{mutex04.c => pthread/pthread_mutex_destroy.c} |   0
 .../pthread_mutex_getprioceiling.c}                |   0
 .../{mutex03.c => pthread/pthread_mutex_init.c}    |   0
 .../{mutex05.c => pthread/pthread_mutex_lock.c}    |   0
 .../pthread_mutex_setprioceiling.c}                |   0
 .../pthread_mutex_timedlock.c}                     |   0
 .../{mutex12.c => pthread/pthread_mutex_trylock.c} |   0
 .../{mutex06.c => pthread/pthread_mutex_unlock.c}  |   0
 .../pthread_mutexattr_destroy.c}                   |   0
 .../pthread_mutexattr_getprioceiling.c}            |   0
 .../pthread_mutexattr_getprotocol.c}               |   0
 .../pthread_mutexattr_getpshared.c}                |   0
 .../pthread_mutexattr_init.c}                      |   0
 .../pthread_mutexattr_setprioceiling.c}            |   0
 .../pthread_mutexattr_setprotocol.c}               |   0
 .../pthread_mutexattr_setpshared.c}                |   0
 .../{pthread27.c => pthread/pthread_once.c}        |   0
 .../{pthread09.c => pthread/pthread_self.c}        |   0
 .../pthread_setcancelstate.c}                      |   0
 .../pthread_setcanceltype.c}                       |   0
 .../pthread_setschedparam.c}                       |   0
 .../{key02.c => pthread/pthread_setspecific.c}     |   0
 .../{pthread31.c => pthread/pthread_testcancel.c}  |   0
 testsuites/psxtests/psxhdrs/pthread11.c            |  57 --------
 testsuites/psxtests/psxhdrs/pthread12.c            |  37 -----
 .../{sched06.c => sched/sched_get_priority_max.c}  |   0
 .../{sched07.c => sched/sched_get_priority_min.c}  |   0
 .../psxhdrs/{sched02.c => sched/sched_getparam.c}  |   0
 .../{sched04.c => sched/sched_getscheduler.c}      |   0
 .../{sched08.c => sched/sched_rr_get_interval.c}   |   0
 .../psxhdrs/{sched01.c => sched/sched_setparam.c}  |   0
 .../{sched03.c => sched/sched_setscheduler.c}      |   0
 .../psxhdrs/{sched05.c => sched/sched_yield.c}     |   0
 .../{signal16.c => signal/pthread_sigmask.c}       |   0
 .../psxhdrs/{signal11.c => signal/raise.c}         |   0
 .../psxhdrs/{signal12.c => signal/signal.c}        |   0
 .../psxhdrs/{signal14.c => signal/sigpending.c}    |   0
 .../psxhdrs/{signal13.c => signal/sigprocmask.c}   |   0
 .../psxhdrs/{signal15.c => signal/sigsuspend.c}    |   0
 .../psxhdrs/{signal18.c => signal/sigtimedwait.c}  |   0
 .../psxhdrs/{signal19.c => signal/sigwait.c}       |   0
 .../psxhdrs/{signal17.c => signal/sigwaitinfo.c}   |   0
 testsuites/psxtests/psxhdrs/signal01.c             |  32 -----
 testsuites/psxtests/psxhdrs/signal02.c             |  32 -----
 testsuites/psxtests/psxhdrs/signal03.c             |  29 ----
 testsuites/psxtests/psxhdrs/signal04.c             |  32 -----
 testsuites/psxtests/psxhdrs/signal05.c             |  29 ----
 testsuites/psxtests/psxhdrs/signal06.c             |  44 ------
 testsuites/psxtests/psxhdrs/signal07.c             |  37 -----
 testsuites/psxtests/psxhdrs/signal08.c             |  39 -----
 testsuites/psxtests/psxhdrs/signal09.c             |  34 -----
 testsuites/psxtests/psxhdrs/signal10.c             |  30 ----
 .../psxtests/psxhdrs/{time06.c => time/asctime.c}  |   0
 .../psxhdrs/{time10.c => time/asctime_r.c}         |   0
 .../psxtests/psxhdrs/{time01.c => time/clock.c}    |   0
 .../{clock04.c => time/clock_getcpuclockid.c}      |   0
 .../{clock06.c => time/clock_getenable_attr.c}     |   0
 .../psxhdrs/{clock03.c => time/clock_getres.c}     |   0
 .../psxhdrs/{clock01.c => time/clock_gettime.c}    |   0
 .../{clock05.c => time/clock_setenable_attr.c}     |   0
 .../psxhdrs/{clock02.c => time/clock_settime.c}    |   0
 .../psxtests/psxhdrs/{time07.c => time/ctime.c}    |   0
 .../psxtests/psxhdrs/{time11.c => time/ctime_r.c}  |   0
 .../psxtests/psxhdrs/{time02.c => time/difftime.c} |   0
 .../psxtests/psxhdrs/{time08.c => time/gmtime.c}   |   0
 .../psxtests/psxhdrs/{time12.c => time/gmtime_r.c} |   0
 .../psxhdrs/{time09.c => time/localtime.c}         |   0
 .../psxhdrs/{time13.c => time/localtime_r.c}       |   0
 .../psxtests/psxhdrs/{time03.c => time/mktime.c}   |   0
 .../psxhdrs/{timer06.c => time/nanosleep.c}        |   0
 .../psxtests/psxhdrs/{time05.c => time/strftime.c} |   0
 .../psxtests/psxhdrs/{time04.c => time/time.c}     |   0
 .../psxhdrs/{timer01.c => time/timer_create.c}     |   0
 .../psxhdrs/{timer02.c => time/timer_delete.c}     |   0
 .../psxhdrs/{timer05.c => time/timer_getoverrun.c} |   0
 .../psxhdrs/{timer04.c => time/timer_gettime.c}    |   0
 .../psxhdrs/{timer03.c => time/timer_settime.c}    |   0
 .../psxhdrs/{signal20.c => unistd/alarm.c}         |   0
 .../psxhdrs/{sync02.c => unistd/fdatasync.c}       |   0
 .../psxtests/psxhdrs/{sync01.c => unistd/fsync.c}  |   0
 .../psxhdrs/{proc06.c => unistd/getegid.c}         |   0
 .../psxhdrs/{proc04.c => unistd/geteuid.c}         |   0
 .../psxtests/psxhdrs/{proc05.c => unistd/getgid.c} |   0
 .../psxhdrs/{proc09.c => unistd/getgroups.c}       |   0
 .../psxhdrs/{proc10.c => unistd/getlogin.c}        |   0
 .../psxhdrs/{proc11.c => unistd/getlogin_r.c}      |   0
 .../psxhdrs/{proc12.c => unistd/getpgrp.c}         |   0
 .../psxtests/psxhdrs/{proc01.c => unistd/getpid.c} |   0
 .../psxhdrs/{proc02.c => unistd/getppid.c}         |   0
 .../psxtests/psxhdrs/{proc03.c => unistd/getuid.c} |   0
 .../psxhdrs/{signal21.c => unistd/pause.c}         |   0
 .../psxtests/psxhdrs/{proc08.c => unistd/setgid.c} |   0
 .../psxhdrs/{proc14.c => unistd/setpgid.c}         |   0
 .../psxtests/psxhdrs/{proc13.c => unistd/setsid.c} |   0
 .../psxtests/psxhdrs/{proc07.c => unistd/setuid.c} |   0
 .../psxhdrs/{signal22.c => unistd/sleep.c}         |   0
 .../psxtests/psxhdrs/{sync03.c => unistd/sync.c}   |   0
 .../psxhdrs/{signal23.c => unistd/ualarm.c}        |   0
 .../psxhdrs/{timer07.c => unistd/usleep.c}         |   0
 142 files changed, 136 insertions(+), 454 deletions(-)

diff --git a/testsuites/psxtests/psxhdrs/Makefile.am b/testsuites/psxtests/psxhdrs/Makefile.am
index 6b0d5d6..0888e24 100644
--- a/testsuites/psxtests/psxhdrs/Makefile.am
+++ b/testsuites/psxtests/psxhdrs/Makefile.am
@@ -1,26 +1,140 @@
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = clock01.c clock02.c clock03.c clock04.c clock05.c clock06.c \
-    cond01.c cond02.c cond03.c cond04.c cond05.c cond06.c cond07.c cond08.c \
-    cond09.c cond10.c key01.c key02.c key03.c key04.c mutex01.c mutex02.c \
-    mutex03.c mutex04.c mutex05.c mutex06.c mutex07.c mutex08.c mutex09.c \
-    mutex10.c mutex11.c mutex12.c mutex13.c mutex14.c mutex15.c mutex16.c \
-    pthread01.c pthread02.c pthread03.c pthread04.c pthread05.c pthread06.c \
-    pthread07.c pthread08.c pthread09.c pthread10.c pthread11.c pthread12.c \
-    pthread13.c pthread14.c pthread15.c pthread16.c pthread17.c pthread18.c \
-    pthread19.c pthread20.c pthread21.c pthread22.c pthread23.c pthread24.c \
-    pthread25.c pthread26.c pthread27.c pthread28.c pthread29.c pthread30.c \
-    pthread31.c pthread32.c pthread34.c \
-    pthread37.c pthread38.c pthread39.c pthread40.c \
-    proc01.c proc02.c proc03.c proc04.c proc05.c proc06.c proc07.c proc08.c \
-    proc09.c proc10.c proc11.c proc12.c proc13.c proc14.c sched01.c \
-    sched02.c sched03.c sched04.c sched05.c sched06.c sched07.c sched08.c \
-    signal01.c signal02.c signal03.c signal04.c signal05.c signal06.c \
-    signal07.c signal08.c signal09.c signal10.c signal11.c signal12.c \
-    signal13.c signal14.c signal15.c signal16.c signal17.c signal18.c \
-    signal19.c signal20.c signal21.c signal22.c signal23.c sync01.c sync02.c \
-    sync03.c time01.c time02.c time03.c time04.c time05.c time06.c time07.c \
-    time08.c time09.c time10.c time11.c time12.c time13.c timer01.c \
-    timer02.c timer03.c timer04.c timer05.c timer06.c timer07.c
+lib_a_SOURCES =
+
+# methods in <pthread.h>
+lib_a_SOURCES += pthread/pthread_attr_destroy.c
+lib_a_SOURCES += pthread/pthread_attr_getdetachstate.c
+lib_a_SOURCES += pthread/pthread_attr_getguardsize.c
+lib_a_SOURCES += pthread/pthread_attr_getinheritsched.c
+lib_a_SOURCES += pthread/pthread_attr_getschedparam.c
+lib_a_SOURCES += pthread/pthread_attr_getschedpolicy.c
+lib_a_SOURCES += pthread/pthread_attr_getscope.c
+lib_a_SOURCES += pthread/pthread_attr_getstackaddr.c
+lib_a_SOURCES += pthread/pthread_attr_getstack.c
+lib_a_SOURCES += pthread/pthread_attr_getstacksize.c
+lib_a_SOURCES += pthread/pthread_attr_init.c
+lib_a_SOURCES += pthread/pthread_attr_setdetachstate.c
+lib_a_SOURCES += pthread/pthread_attr_setguardsize.c
+lib_a_SOURCES += pthread/pthread_attr_setinheritsched.c
+lib_a_SOURCES += pthread/pthread_attr_setschedparam.c
+lib_a_SOURCES += pthread/pthread_attr_setschedpolicy.c
+lib_a_SOURCES += pthread/pthread_attr_setscope.c
+lib_a_SOURCES += pthread/pthread_attr_setstackaddr.c
+lib_a_SOURCES += pthread/pthread_attr_setstack.c
+lib_a_SOURCES += pthread/pthread_attr_setstacksize.c
+lib_a_SOURCES += pthread/pthread_cancel.c
+lib_a_SOURCES += pthread/pthread_cleanup.c
+lib_a_SOURCES += pthread/pthread_condattr_destroy.c
+lib_a_SOURCES += pthread/pthread_condattr_getpshared.c
+lib_a_SOURCES += pthread/pthread_condattr_init.c
+lib_a_SOURCES += pthread/pthread_condattr_setpshared.c
+lib_a_SOURCES += pthread/pthread_cond_broadcast.c
+lib_a_SOURCES += pthread/pthread_cond_destroy.c
+lib_a_SOURCES += pthread/pthread_cond_init.c
+lib_a_SOURCES += pthread/pthread_cond_signal.c
+lib_a_SOURCES += pthread/pthread_cond_timedwait.c
+lib_a_SOURCES += pthread/pthread_cond_wait.c
+lib_a_SOURCES += pthread/pthread_create.c
+lib_a_SOURCES += pthread/pthread_detach.c
+lib_a_SOURCES += pthread/pthread_equal.c
+lib_a_SOURCES += pthread/pthread_exit.c
+lib_a_SOURCES += pthread/pthread_getcpuclockid.c
+lib_a_SOURCES += pthread/pthread_getschedparam.c
+lib_a_SOURCES += pthread/pthread_getspecific.c
+lib_a_SOURCES += pthread/pthread_join.c
+lib_a_SOURCES += pthread/pthread_key_create.c
+lib_a_SOURCES += pthread/pthread_key_delete.c
+lib_a_SOURCES += pthread/pthread_mutexattr_destroy.c
+lib_a_SOURCES += pthread/pthread_mutexattr_getprioceiling.c
+lib_a_SOURCES += pthread/pthread_mutexattr_getprotocol.c
+lib_a_SOURCES += pthread/pthread_mutexattr_getpshared.c
+lib_a_SOURCES += pthread/pthread_mutexattr_init.c
+lib_a_SOURCES += pthread/pthread_mutexattr_setprioceiling.c
+lib_a_SOURCES += pthread/pthread_mutexattr_setprotocol.c
+lib_a_SOURCES += pthread/pthread_mutexattr_setpshared.c
+lib_a_SOURCES += pthread/pthread_mutex_destroy.c
+lib_a_SOURCES += pthread/pthread_mutex_getprioceiling.c
+lib_a_SOURCES += pthread/pthread_mutex_init.c
+lib_a_SOURCES += pthread/pthread_mutex_lock.c
+lib_a_SOURCES += pthread/pthread_mutex_setprioceiling.c
+lib_a_SOURCES += pthread/pthread_mutex_timedlock.c
+lib_a_SOURCES += pthread/pthread_mutex_trylock.c
+lib_a_SOURCES += pthread/pthread_mutex_unlock.c
+lib_a_SOURCES += pthread/pthread_once.c
+lib_a_SOURCES += pthread/pthread_self.c
+lib_a_SOURCES += pthread/pthread_setcancelstate.c
+lib_a_SOURCES += pthread/pthread_setcanceltype.c
+lib_a_SOURCES += pthread/pthread_setschedparam.c
+lib_a_SOURCES += pthread/pthread_setspecific.c
+lib_a_SOURCES += pthread/pthread_testcancel.c
+# methods in <sched.h>
+lib_a_SOURCES += sched/sched_getparam.c
+lib_a_SOURCES += sched/sched_get_priority_max.c
+lib_a_SOURCES += sched/sched_get_priority_min.c
+lib_a_SOURCES += sched/sched_getscheduler.c
+lib_a_SOURCES += sched/sched_rr_get_interval.c
+lib_a_SOURCES += sched/sched_setparam.c
+lib_a_SOURCES += sched/sched_setscheduler.c
+lib_a_SOURCES += sched/sched_yield.c
+# methods in <signal.h>
+lib_a_SOURCES += signal/pthread_sigmask.c
+lib_a_SOURCES += signal/raise.c
+lib_a_SOURCES += signal/signal.c
+lib_a_SOURCES += signal/sigpending.c
+lib_a_SOURCES += signal/sigprocmask.c
+lib_a_SOURCES += signal/sigsuspend.c
+lib_a_SOURCES += signal/sigtimedwait.c
+lib_a_SOURCES += signal/sigwait.c
+lib_a_SOURCES += signal/sigwaitinfo.c
+# methods in <time.h>
+lib_a_SOURCES += time/asctime.c
+lib_a_SOURCES += time/asctime_r.c
+lib_a_SOURCES += time/clock.c
+lib_a_SOURCES += time/clock_getcpuclockid.c
+lib_a_SOURCES += time/clock_getenable_attr.c
+lib_a_SOURCES += time/clock_getres.c
+lib_a_SOURCES += time/clock_gettime.c
+lib_a_SOURCES += time/clock_setenable_attr.c
+lib_a_SOURCES += time/clock_settime.c
+lib_a_SOURCES += time/ctime.c
+lib_a_SOURCES += time/ctime_r.c
+lib_a_SOURCES += time/difftime.c
+lib_a_SOURCES += time/gmtime.c
+lib_a_SOURCES += time/gmtime_r.c
+lib_a_SOURCES += time/localtime.c
+lib_a_SOURCES += time/localtime_r.c
+lib_a_SOURCES += time/mktime.c
+lib_a_SOURCES += time/nanosleep.c
+lib_a_SOURCES += time/strftime.c
+lib_a_SOURCES += time/time.c
+lib_a_SOURCES += time/timer_create.c
+lib_a_SOURCES += time/timer_delete.c
+lib_a_SOURCES += time/timer_getoverrun.c
+lib_a_SOURCES += time/timer_gettime.c
+lib_a_SOURCES += time/timer_settime.c
+# methods in <unistd.h>
+lib_a_SOURCES += unistd/alarm.c
+lib_a_SOURCES += unistd/fdatasync.c
+lib_a_SOURCES += unistd/fsync.c
+lib_a_SOURCES += unistd/getegid.c
+lib_a_SOURCES += unistd/geteuid.c
+lib_a_SOURCES += unistd/getgid.c
+lib_a_SOURCES += unistd/getgroups.c
+lib_a_SOURCES += unistd/getlogin.c
+lib_a_SOURCES += unistd/getlogin_r.c
+lib_a_SOURCES += unistd/getpgrp.c
+lib_a_SOURCES += unistd/getpid.c
+lib_a_SOURCES += unistd/getppid.c
+lib_a_SOURCES += unistd/getuid.c
+lib_a_SOURCES += unistd/pause.c
+lib_a_SOURCES += unistd/setgid.c
+lib_a_SOURCES += unistd/setpgid.c
+lib_a_SOURCES += unistd/setsid.c
+lib_a_SOURCES += unistd/setuid.c
+lib_a_SOURCES += unistd/sleep.c
+lib_a_SOURCES += unistd/sync.c
+lib_a_SOURCES += unistd/ualarm.c
+lib_a_SOURCES += unistd/usleep.c
 
 if HAS_NETWORKING
 # methods in <sys/socket.h>
diff --git a/testsuites/psxtests/psxhdrs/pthread02.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread02.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_destroy.c
diff --git a/testsuites/psxtests/psxhdrs/pthread04.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread04.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getdetachstate.c
diff --git a/testsuites/psxtests/psxhdrs/pthread40.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread40.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getguardsize.c
diff --git a/testsuites/psxtests/psxhdrs/pthread16.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread16.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getinheritsched.c
diff --git a/testsuites/psxtests/psxhdrs/pthread20.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread20.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedparam.c
diff --git a/testsuites/psxtests/psxhdrs/pthread18.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread18.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getschedpolicy.c
diff --git a/testsuites/psxtests/psxhdrs/pthread14.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread14.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getscope.c
diff --git a/testsuites/psxtests/psxhdrs/pthread38.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread38.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstack.c
diff --git a/testsuites/psxtests/psxhdrs/pthread25.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread25.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstackaddr.c
diff --git a/testsuites/psxtests/psxhdrs/pthread06.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread06.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_getstacksize.c
diff --git a/testsuites/psxtests/psxhdrs/pthread01.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread01.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_init.c
diff --git a/testsuites/psxtests/psxhdrs/pthread03.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setdetachstate.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread03.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setdetachstate.c
diff --git a/testsuites/psxtests/psxhdrs/pthread39.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread39.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setguardsize.c
diff --git a/testsuites/psxtests/psxhdrs/pthread15.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread15.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setinheritsched.c
diff --git a/testsuites/psxtests/psxhdrs/pthread19.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread19.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedparam.c
diff --git a/testsuites/psxtests/psxhdrs/pthread17.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread17.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setschedpolicy.c
diff --git a/testsuites/psxtests/psxhdrs/pthread13.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread13.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setscope.c
diff --git a/testsuites/psxtests/psxhdrs/pthread37.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread37.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstack.c
diff --git a/testsuites/psxtests/psxhdrs/pthread24.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread24.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstackaddr.c
diff --git a/testsuites/psxtests/psxhdrs/pthread05.c b/testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread05.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_attr_setstacksize.c
diff --git a/testsuites/psxtests/psxhdrs/pthread28.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread28.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cancel.c
diff --git a/testsuites/psxtests/psxhdrs/pthread32.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread32.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cleanup.c
diff --git a/testsuites/psxtests/psxhdrs/cond10.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond10.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_broadcast.c
diff --git a/testsuites/psxtests/psxhdrs/cond04.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond04.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_destroy.c
diff --git a/testsuites/psxtests/psxhdrs/cond03.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond03.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_init.c
diff --git a/testsuites/psxtests/psxhdrs/cond05.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond05.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_signal.c
diff --git a/testsuites/psxtests/psxhdrs/cond07.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond07.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_timedwait.c
diff --git a/testsuites/psxtests/psxhdrs/cond06.c b/testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond06.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_cond_wait.c
diff --git a/testsuites/psxtests/psxhdrs/cond02.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond02.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_condattr_destroy.c
diff --git a/testsuites/psxtests/psxhdrs/cond08.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond08.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_condattr_getpshared.c
diff --git a/testsuites/psxtests/psxhdrs/cond01.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond01.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_condattr_init.c
diff --git a/testsuites/psxtests/psxhdrs/cond09.c b/testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/cond09.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_condattr_setpshared.c
diff --git a/testsuites/psxtests/psxhdrs/pthread07.c b/testsuites/psxtests/psxhdrs/pthread/pthread_create.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread07.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_create.c
diff --git a/testsuites/psxtests/psxhdrs/pthread21.c b/testsuites/psxtests/psxhdrs/pthread/pthread_detach.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread21.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_detach.c
diff --git a/testsuites/psxtests/psxhdrs/pthread10.c b/testsuites/psxtests/psxhdrs/pthread/pthread_equal.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread10.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_equal.c
diff --git a/testsuites/psxtests/psxhdrs/pthread08.c b/testsuites/psxtests/psxhdrs/pthread/pthread_exit.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread08.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_exit.c
diff --git a/testsuites/psxtests/psxhdrs/pthread34.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread34.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_getcpuclockid.c
diff --git a/testsuites/psxtests/psxhdrs/pthread23.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread23.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_getschedparam.c
diff --git a/testsuites/psxtests/psxhdrs/key03.c b/testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/key03.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_getspecific.c
diff --git a/testsuites/psxtests/psxhdrs/pthread26.c b/testsuites/psxtests/psxhdrs/pthread/pthread_join.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread26.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_join.c
diff --git a/testsuites/psxtests/psxhdrs/key01.c b/testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/key01.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_key_create.c
diff --git a/testsuites/psxtests/psxhdrs/key04.c b/testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/key04.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_key_delete.c
diff --git a/testsuites/psxtests/psxhdrs/mutex04.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex04.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_destroy.c
diff --git a/testsuites/psxtests/psxhdrs/mutex15.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex15.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_getprioceiling.c
diff --git a/testsuites/psxtests/psxhdrs/mutex03.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex03.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_init.c
diff --git a/testsuites/psxtests/psxhdrs/mutex05.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex05.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_lock.c
diff --git a/testsuites/psxtests/psxhdrs/mutex16.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex16.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_setprioceiling.c
diff --git a/testsuites/psxtests/psxhdrs/mutex13.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex13.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_timedlock.c
diff --git a/testsuites/psxtests/psxhdrs/mutex12.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex12.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_trylock.c
diff --git a/testsuites/psxtests/psxhdrs/mutex06.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex06.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutex_unlock.c
diff --git a/testsuites/psxtests/psxhdrs/mutex02.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex02.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_destroy.c
diff --git a/testsuites/psxtests/psxhdrs/mutex08.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex08.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprioceiling.c
diff --git a/testsuites/psxtests/psxhdrs/mutex14.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex14.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getprotocol.c
diff --git a/testsuites/psxtests/psxhdrs/mutex10.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex10.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_getpshared.c
diff --git a/testsuites/psxtests/psxhdrs/mutex01.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex01.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_init.c
diff --git a/testsuites/psxtests/psxhdrs/mutex09.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex09.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprioceiling.c
diff --git a/testsuites/psxtests/psxhdrs/mutex07.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex07.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setprotocol.c
diff --git a/testsuites/psxtests/psxhdrs/mutex11.c b/testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/mutex11.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_mutexattr_setpshared.c
diff --git a/testsuites/psxtests/psxhdrs/pthread27.c b/testsuites/psxtests/psxhdrs/pthread/pthread_once.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread27.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_once.c
diff --git a/testsuites/psxtests/psxhdrs/pthread09.c b/testsuites/psxtests/psxhdrs/pthread/pthread_self.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread09.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_self.c
diff --git a/testsuites/psxtests/psxhdrs/pthread29.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread29.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_setcancelstate.c
diff --git a/testsuites/psxtests/psxhdrs/pthread30.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread30.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_setcanceltype.c
diff --git a/testsuites/psxtests/psxhdrs/pthread22.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread22.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_setschedparam.c
diff --git a/testsuites/psxtests/psxhdrs/key02.c b/testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/key02.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_setspecific.c
diff --git a/testsuites/psxtests/psxhdrs/pthread31.c b/testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/pthread31.c
rename to testsuites/psxtests/psxhdrs/pthread/pthread_testcancel.c
diff --git a/testsuites/psxtests/psxhdrs/pthread11.c b/testsuites/psxtests/psxhdrs/pthread11.c
deleted file mode 100644
index 4f55efd..0000000
--- a/testsuites/psxtests/psxhdrs/pthread11.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pthread.h>
-
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_setschedparam"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  pthread_t           thread;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  thread = 0;
-
-  policy = SCHED_OTHER;
-  policy = SCHED_FIFO;
-  policy = SCHED_RR;
-#ifdef _POSIX_SPORADIC_SERVER
-  policy = SCHED_SPORADIC;
-#endif
-
-  /*
-   *  really should use sched_get_priority_min() and sched_get_priority_max()
-   */
-
-  param.sched_priority = 0;
-#ifdef _POSIX_SPORADIC_SERVER
-  param.sched_ss_low_priority = 0;
-  param.sched_ss_repl_period.tv_sec = 0;
-  param.sched_ss_repl_period.tv_nsec = 0;
-  param.sched_ss_init_budget.tv_sec = 0;
-  param.sched_ss_init_budget.tv_nsec = 0;
-#endif
-
-  result = pthread_setschedparam( thread, policy, &param );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/pthread12.c b/testsuites/psxtests/psxhdrs/pthread12.c
deleted file mode 100644
index 47b69d4..0000000
--- a/testsuites/psxtests/psxhdrs/pthread12.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pthread.h>
-
-#ifndef _POSIX_THREAD_PRIORITY_SCHEDULING
-#error "RTEMS is supposed to have pthread_getschedparam"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  pthread_t           thread;
-  int                 policy;
-  struct sched_param  param;
-  int                 result;
-
-  thread = 0;
-
-  result = pthread_getschedparam( thread, &policy, &param );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/sched06.c b/testsuites/psxtests/psxhdrs/sched/sched_get_priority_max.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched06.c
rename to testsuites/psxtests/psxhdrs/sched/sched_get_priority_max.c
diff --git a/testsuites/psxtests/psxhdrs/sched07.c b/testsuites/psxtests/psxhdrs/sched/sched_get_priority_min.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched07.c
rename to testsuites/psxtests/psxhdrs/sched/sched_get_priority_min.c
diff --git a/testsuites/psxtests/psxhdrs/sched02.c b/testsuites/psxtests/psxhdrs/sched/sched_getparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched02.c
rename to testsuites/psxtests/psxhdrs/sched/sched_getparam.c
diff --git a/testsuites/psxtests/psxhdrs/sched04.c b/testsuites/psxtests/psxhdrs/sched/sched_getscheduler.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched04.c
rename to testsuites/psxtests/psxhdrs/sched/sched_getscheduler.c
diff --git a/testsuites/psxtests/psxhdrs/sched08.c b/testsuites/psxtests/psxhdrs/sched/sched_rr_get_interval.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched08.c
rename to testsuites/psxtests/psxhdrs/sched/sched_rr_get_interval.c
diff --git a/testsuites/psxtests/psxhdrs/sched01.c b/testsuites/psxtests/psxhdrs/sched/sched_setparam.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched01.c
rename to testsuites/psxtests/psxhdrs/sched/sched_setparam.c
diff --git a/testsuites/psxtests/psxhdrs/sched03.c b/testsuites/psxtests/psxhdrs/sched/sched_setscheduler.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched03.c
rename to testsuites/psxtests/psxhdrs/sched/sched_setscheduler.c
diff --git a/testsuites/psxtests/psxhdrs/sched05.c b/testsuites/psxtests/psxhdrs/sched/sched_yield.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sched05.c
rename to testsuites/psxtests/psxhdrs/sched/sched_yield.c
diff --git a/testsuites/psxtests/psxhdrs/signal16.c b/testsuites/psxtests/psxhdrs/signal/pthread_sigmask.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal16.c
rename to testsuites/psxtests/psxhdrs/signal/pthread_sigmask.c
diff --git a/testsuites/psxtests/psxhdrs/signal11.c b/testsuites/psxtests/psxhdrs/signal/raise.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal11.c
rename to testsuites/psxtests/psxhdrs/signal/raise.c
diff --git a/testsuites/psxtests/psxhdrs/signal12.c b/testsuites/psxtests/psxhdrs/signal/signal.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal12.c
rename to testsuites/psxtests/psxhdrs/signal/signal.c
diff --git a/testsuites/psxtests/psxhdrs/signal14.c b/testsuites/psxtests/psxhdrs/signal/sigpending.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal14.c
rename to testsuites/psxtests/psxhdrs/signal/sigpending.c
diff --git a/testsuites/psxtests/psxhdrs/signal13.c b/testsuites/psxtests/psxhdrs/signal/sigprocmask.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal13.c
rename to testsuites/psxtests/psxhdrs/signal/sigprocmask.c
diff --git a/testsuites/psxtests/psxhdrs/signal15.c b/testsuites/psxtests/psxhdrs/signal/sigsuspend.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal15.c
rename to testsuites/psxtests/psxhdrs/signal/sigsuspend.c
diff --git a/testsuites/psxtests/psxhdrs/signal18.c b/testsuites/psxtests/psxhdrs/signal/sigtimedwait.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal18.c
rename to testsuites/psxtests/psxhdrs/signal/sigtimedwait.c
diff --git a/testsuites/psxtests/psxhdrs/signal19.c b/testsuites/psxtests/psxhdrs/signal/sigwait.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal19.c
rename to testsuites/psxtests/psxhdrs/signal/sigwait.c
diff --git a/testsuites/psxtests/psxhdrs/signal17.c b/testsuites/psxtests/psxhdrs/signal/sigwaitinfo.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal17.c
rename to testsuites/psxtests/psxhdrs/signal/sigwaitinfo.c
diff --git a/testsuites/psxtests/psxhdrs/signal01.c b/testsuites/psxtests/psxhdrs/signal01.c
deleted file mode 100644
index 245e025..0000000
--- a/testsuites/psxtests/psxhdrs/signal01.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigaddset( &signal_set, signal_number );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal02.c b/testsuites/psxtests/psxhdrs/signal02.c
deleted file mode 100644
index c62f95c..0000000
--- a/testsuites/psxtests/psxhdrs/signal02.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigdelset( &signal_set, signal_number );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal03.c b/testsuites/psxtests/psxhdrs/signal03.c
deleted file mode 100644
index e2f552e..0000000
--- a/testsuites/psxtests/psxhdrs/signal03.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t signal_set;
-  int      result;
-
-  result = sigfillset( &signal_set );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal04.c b/testsuites/psxtests/psxhdrs/signal04.c
deleted file mode 100644
index e2ae23e..0000000
--- a/testsuites/psxtests/psxhdrs/signal04.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t signal_set;
-  int      signal_number;
-  int      result;
-
-  signal_number = SIGALRM;
-
-  result = sigismember( &signal_set, signal_number );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal05.c b/testsuites/psxtests/psxhdrs/signal05.c
deleted file mode 100644
index 8932563..0000000
--- a/testsuites/psxtests/psxhdrs/signal05.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t signal_set;
-  int      result;
-
-  result = sigemptyset( &signal_set );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal06.c b/testsuites/psxtests/psxhdrs/signal06.c
deleted file mode 100644
index a391a14..0000000
--- a/testsuites/psxtests/psxhdrs/signal06.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  int              signal_number;
-  struct sigaction act;
-  struct sigaction oact;
-  int              result;
-
-  signal_number = SIGALRM;
-
-  /*
-   *  Really should not reference sa_handler and sa_signction simultaneously.
-   */
-
-  act.sa_handler = SIG_DFL;
-  act.sa_handler = SIG_IGN;
-  act.sa_mask  = 0;
-  act.sa_flags = SA_NOCLDSTOP;
-  act.sa_flags = SA_SIGINFO;
-  act.sa_sigaction = NULL;
-
-  result = sigaction( signal_number, &act, &oact );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal07.c b/testsuites/psxtests/psxhdrs/signal07.c
deleted file mode 100644
index 52a53ca..0000000
--- a/testsuites/psxtests/psxhdrs/signal07.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_kill"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  pthread_t  thread;
-  int        signal_number;
-  int        result;
-
-  thread = 0;
-  signal_number = SIGALRM;
-
-  result = pthread_kill( thread, signal_number );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal08.c b/testsuites/psxtests/psxhdrs/signal08.c
deleted file mode 100644
index 730a23b..0000000
--- a/testsuites/psxtests/psxhdrs/signal08.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-#ifndef _POSIX_THREADS
-#error "rtems is supposed to have pthread_sigmask"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  int       how;
-  sigset_t  set;
-  sigset_t  oset;
-  int       result;
-
-  how = SIG_BLOCK;
-  how = SIG_UNBLOCK;
-  how = SIG_SETMASK;
-
-  result = pthread_sigmask( how, &set, &oset );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal09.c b/testsuites/psxtests/psxhdrs/signal09.c
deleted file mode 100644
index 263750c..0000000
--- a/testsuites/psxtests/psxhdrs/signal09.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <sys/types.h>
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  pid_t pid;
-  int   signal_number;
-  int   result;
-
-  pid = 0;
-  signal_number = SIGALRM;
-
-  result = kill( pid, signal_number );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/signal10.c b/testsuites/psxtests/psxhdrs/signal10.c
deleted file mode 100644
index ee5f036..0000000
--- a/testsuites/psxtests/psxhdrs/signal10.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  This test file is used to verify that the header files associated with
- *  invoking this function are correct.
- *
- *  COPYRIGHT (c) 1989-2009.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.org/license/LICENSE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <signal.h>
-
-int test( void );
-
-int test( void )
-{
-  sigset_t  set;
-  int       sig;
-  int       result;
-
-  result = sigwait( &set, &sig );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/time06.c b/testsuites/psxtests/psxhdrs/time/asctime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time06.c
rename to testsuites/psxtests/psxhdrs/time/asctime.c
diff --git a/testsuites/psxtests/psxhdrs/time10.c b/testsuites/psxtests/psxhdrs/time/asctime_r.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time10.c
rename to testsuites/psxtests/psxhdrs/time/asctime_r.c
diff --git a/testsuites/psxtests/psxhdrs/time01.c b/testsuites/psxtests/psxhdrs/time/clock.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time01.c
rename to testsuites/psxtests/psxhdrs/time/clock.c
diff --git a/testsuites/psxtests/psxhdrs/clock04.c b/testsuites/psxtests/psxhdrs/time/clock_getcpuclockid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock04.c
rename to testsuites/psxtests/psxhdrs/time/clock_getcpuclockid.c
diff --git a/testsuites/psxtests/psxhdrs/clock06.c b/testsuites/psxtests/psxhdrs/time/clock_getenable_attr.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock06.c
rename to testsuites/psxtests/psxhdrs/time/clock_getenable_attr.c
diff --git a/testsuites/psxtests/psxhdrs/clock03.c b/testsuites/psxtests/psxhdrs/time/clock_getres.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock03.c
rename to testsuites/psxtests/psxhdrs/time/clock_getres.c
diff --git a/testsuites/psxtests/psxhdrs/clock01.c b/testsuites/psxtests/psxhdrs/time/clock_gettime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock01.c
rename to testsuites/psxtests/psxhdrs/time/clock_gettime.c
diff --git a/testsuites/psxtests/psxhdrs/clock05.c b/testsuites/psxtests/psxhdrs/time/clock_setenable_attr.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock05.c
rename to testsuites/psxtests/psxhdrs/time/clock_setenable_attr.c
diff --git a/testsuites/psxtests/psxhdrs/clock02.c b/testsuites/psxtests/psxhdrs/time/clock_settime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/clock02.c
rename to testsuites/psxtests/psxhdrs/time/clock_settime.c
diff --git a/testsuites/psxtests/psxhdrs/time07.c b/testsuites/psxtests/psxhdrs/time/ctime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time07.c
rename to testsuites/psxtests/psxhdrs/time/ctime.c
diff --git a/testsuites/psxtests/psxhdrs/time11.c b/testsuites/psxtests/psxhdrs/time/ctime_r.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time11.c
rename to testsuites/psxtests/psxhdrs/time/ctime_r.c
diff --git a/testsuites/psxtests/psxhdrs/time02.c b/testsuites/psxtests/psxhdrs/time/difftime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time02.c
rename to testsuites/psxtests/psxhdrs/time/difftime.c
diff --git a/testsuites/psxtests/psxhdrs/time08.c b/testsuites/psxtests/psxhdrs/time/gmtime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time08.c
rename to testsuites/psxtests/psxhdrs/time/gmtime.c
diff --git a/testsuites/psxtests/psxhdrs/time12.c b/testsuites/psxtests/psxhdrs/time/gmtime_r.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time12.c
rename to testsuites/psxtests/psxhdrs/time/gmtime_r.c
diff --git a/testsuites/psxtests/psxhdrs/time09.c b/testsuites/psxtests/psxhdrs/time/localtime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time09.c
rename to testsuites/psxtests/psxhdrs/time/localtime.c
diff --git a/testsuites/psxtests/psxhdrs/time13.c b/testsuites/psxtests/psxhdrs/time/localtime_r.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time13.c
rename to testsuites/psxtests/psxhdrs/time/localtime_r.c
diff --git a/testsuites/psxtests/psxhdrs/time03.c b/testsuites/psxtests/psxhdrs/time/mktime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time03.c
rename to testsuites/psxtests/psxhdrs/time/mktime.c
diff --git a/testsuites/psxtests/psxhdrs/timer06.c b/testsuites/psxtests/psxhdrs/time/nanosleep.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer06.c
rename to testsuites/psxtests/psxhdrs/time/nanosleep.c
diff --git a/testsuites/psxtests/psxhdrs/time05.c b/testsuites/psxtests/psxhdrs/time/strftime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time05.c
rename to testsuites/psxtests/psxhdrs/time/strftime.c
diff --git a/testsuites/psxtests/psxhdrs/time04.c b/testsuites/psxtests/psxhdrs/time/time.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/time04.c
rename to testsuites/psxtests/psxhdrs/time/time.c
diff --git a/testsuites/psxtests/psxhdrs/timer01.c b/testsuites/psxtests/psxhdrs/time/timer_create.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer01.c
rename to testsuites/psxtests/psxhdrs/time/timer_create.c
diff --git a/testsuites/psxtests/psxhdrs/timer02.c b/testsuites/psxtests/psxhdrs/time/timer_delete.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer02.c
rename to testsuites/psxtests/psxhdrs/time/timer_delete.c
diff --git a/testsuites/psxtests/psxhdrs/timer05.c b/testsuites/psxtests/psxhdrs/time/timer_getoverrun.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer05.c
rename to testsuites/psxtests/psxhdrs/time/timer_getoverrun.c
diff --git a/testsuites/psxtests/psxhdrs/timer04.c b/testsuites/psxtests/psxhdrs/time/timer_gettime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer04.c
rename to testsuites/psxtests/psxhdrs/time/timer_gettime.c
diff --git a/testsuites/psxtests/psxhdrs/timer03.c b/testsuites/psxtests/psxhdrs/time/timer_settime.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer03.c
rename to testsuites/psxtests/psxhdrs/time/timer_settime.c
diff --git a/testsuites/psxtests/psxhdrs/signal20.c b/testsuites/psxtests/psxhdrs/unistd/alarm.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal20.c
rename to testsuites/psxtests/psxhdrs/unistd/alarm.c
diff --git a/testsuites/psxtests/psxhdrs/sync02.c b/testsuites/psxtests/psxhdrs/unistd/fdatasync.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sync02.c
rename to testsuites/psxtests/psxhdrs/unistd/fdatasync.c
diff --git a/testsuites/psxtests/psxhdrs/sync01.c b/testsuites/psxtests/psxhdrs/unistd/fsync.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sync01.c
rename to testsuites/psxtests/psxhdrs/unistd/fsync.c
diff --git a/testsuites/psxtests/psxhdrs/proc06.c b/testsuites/psxtests/psxhdrs/unistd/getegid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc06.c
rename to testsuites/psxtests/psxhdrs/unistd/getegid.c
diff --git a/testsuites/psxtests/psxhdrs/proc04.c b/testsuites/psxtests/psxhdrs/unistd/geteuid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc04.c
rename to testsuites/psxtests/psxhdrs/unistd/geteuid.c
diff --git a/testsuites/psxtests/psxhdrs/proc05.c b/testsuites/psxtests/psxhdrs/unistd/getgid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc05.c
rename to testsuites/psxtests/psxhdrs/unistd/getgid.c
diff --git a/testsuites/psxtests/psxhdrs/proc09.c b/testsuites/psxtests/psxhdrs/unistd/getgroups.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc09.c
rename to testsuites/psxtests/psxhdrs/unistd/getgroups.c
diff --git a/testsuites/psxtests/psxhdrs/proc10.c b/testsuites/psxtests/psxhdrs/unistd/getlogin.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc10.c
rename to testsuites/psxtests/psxhdrs/unistd/getlogin.c
diff --git a/testsuites/psxtests/psxhdrs/proc11.c b/testsuites/psxtests/psxhdrs/unistd/getlogin_r.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc11.c
rename to testsuites/psxtests/psxhdrs/unistd/getlogin_r.c
diff --git a/testsuites/psxtests/psxhdrs/proc12.c b/testsuites/psxtests/psxhdrs/unistd/getpgrp.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc12.c
rename to testsuites/psxtests/psxhdrs/unistd/getpgrp.c
diff --git a/testsuites/psxtests/psxhdrs/proc01.c b/testsuites/psxtests/psxhdrs/unistd/getpid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc01.c
rename to testsuites/psxtests/psxhdrs/unistd/getpid.c
diff --git a/testsuites/psxtests/psxhdrs/proc02.c b/testsuites/psxtests/psxhdrs/unistd/getppid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc02.c
rename to testsuites/psxtests/psxhdrs/unistd/getppid.c
diff --git a/testsuites/psxtests/psxhdrs/proc03.c b/testsuites/psxtests/psxhdrs/unistd/getuid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc03.c
rename to testsuites/psxtests/psxhdrs/unistd/getuid.c
diff --git a/testsuites/psxtests/psxhdrs/signal21.c b/testsuites/psxtests/psxhdrs/unistd/pause.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal21.c
rename to testsuites/psxtests/psxhdrs/unistd/pause.c
diff --git a/testsuites/psxtests/psxhdrs/proc08.c b/testsuites/psxtests/psxhdrs/unistd/setgid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc08.c
rename to testsuites/psxtests/psxhdrs/unistd/setgid.c
diff --git a/testsuites/psxtests/psxhdrs/proc14.c b/testsuites/psxtests/psxhdrs/unistd/setpgid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc14.c
rename to testsuites/psxtests/psxhdrs/unistd/setpgid.c
diff --git a/testsuites/psxtests/psxhdrs/proc13.c b/testsuites/psxtests/psxhdrs/unistd/setsid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc13.c
rename to testsuites/psxtests/psxhdrs/unistd/setsid.c
diff --git a/testsuites/psxtests/psxhdrs/proc07.c b/testsuites/psxtests/psxhdrs/unistd/setuid.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/proc07.c
rename to testsuites/psxtests/psxhdrs/unistd/setuid.c
diff --git a/testsuites/psxtests/psxhdrs/signal22.c b/testsuites/psxtests/psxhdrs/unistd/sleep.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal22.c
rename to testsuites/psxtests/psxhdrs/unistd/sleep.c
diff --git a/testsuites/psxtests/psxhdrs/sync03.c b/testsuites/psxtests/psxhdrs/unistd/sync.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/sync03.c
rename to testsuites/psxtests/psxhdrs/unistd/sync.c
diff --git a/testsuites/psxtests/psxhdrs/signal23.c b/testsuites/psxtests/psxhdrs/unistd/ualarm.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/signal23.c
rename to testsuites/psxtests/psxhdrs/unistd/ualarm.c
diff --git a/testsuites/psxtests/psxhdrs/timer07.c b/testsuites/psxtests/psxhdrs/unistd/usleep.c
similarity index 100%
rename from testsuites/psxtests/psxhdrs/timer07.c
rename to testsuites/psxtests/psxhdrs/unistd/usleep.c




More information about the vc mailing list