[rtems commit] psxtests: Fix link-time errors

[Sebastian Huber]

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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jan 19 09:31:58 2016 +0100

psxtests: Fix link-time errors

Fix link-time errors introduced by
e39cdb875ce7458787b0be173f2f7893a774a673.

Update #2531.

---

 testsuites/psxtests/psxenosys/init.c               |  8 -----
 testsuites/psxtests/psxenosys/psxenosys.doc        |  2 --
 testsuites/psxtests/psxenosys/psxenosys.scn        |  6 ++--
 testsuites/psxtests/psxhdrs/Makefile.am            |  2 --
 .../psxtests/psxhdrs/time/clock_getenable_attr.c   | 37 --------------------
 .../psxtests/psxhdrs/time/clock_setenable_attr.c   | 40 ----------------------
 6 files changed, 2 insertions(+), 93 deletions(-)

diff --git a/testsuites/psxtests/psxenosys/init.c b/testsuites/psxtests/psxenosys/init.c
index 6ae7c1d..e092744 100644
--- a/testsuites/psxtests/psxenosys/init.c
+++ b/testsuites/psxtests/psxenosys/init.c
@@ -67,14 +67,6 @@ void *POSIX_Init(
   sc = clock_getcpuclockid( 0, NULL );
   check_enosys( sc );
 
-  puts( "clock_getenable_attr -- ENOSYS" );
-  sc = clock_getenable_attr( 0, NULL );
-  check_enosys( sc );
-
-  puts( "clock_setenable_attr -- ENOSYS" );
-  sc = clock_setenable_attr( 0, 0 );
-  check_enosys( sc );
-
   puts( "execl -- ENOSYS" );
   sc = execl( NULL, NULL, (char*)0 );
   check_enosys( sc );
diff --git a/testsuites/psxtests/psxenosys/psxenosys.doc b/testsuites/psxtests/psxenosys/psxenosys.doc
index 55c1f39..e90b974 100644
--- a/testsuites/psxtests/psxenosys/psxenosys.doc
+++ b/testsuites/psxtests/psxenosys/psxenosys.doc
@@ -21,8 +21,6 @@ directives:
   aio_suspend
   aio_fsync
   clock_getcpuclockid
-  clock_getenable_attr
-  clock_setenable_attr
   execl
   execle
   execlp
diff --git a/testsuites/psxtests/psxenosys/psxenosys.scn b/testsuites/psxtests/psxenosys/psxenosys.scn
index 7d86278..1ed64f9 100644
--- a/testsuites/psxtests/psxenosys/psxenosys.scn
+++ b/testsuites/psxtests/psxenosys/psxenosys.scn
@@ -1,9 +1,7 @@
-*** POSIX TEST -- ENOSYS ***
+*** BEGIN OF TEST PSXENOSYS ***
 lio_listio -- ENOSYS
 aio_suspend -- ENOSYS
 clock_getcpuclockid -- ENOSYS
-clock_getenable_attr -- ENOSYS
-clock_setenable_attr -- ENOSYS
 execl -- ENOSYS
 execle -- ENOSYS
 execlp -- ENOSYS
@@ -21,4 +19,4 @@ wait -- ENOSYS
 waitpid -- ENOSYS
 mprotect -- stub implementation - OK
 vfork -- stub implementation - OK
-*** END OF POSIX TEST ENOSYS ***
+*** END OF TEST PSXENOSYS ***
diff --git a/testsuites/psxtests/psxhdrs/Makefile.am b/testsuites/psxtests/psxhdrs/Makefile.am
index 0888e24..8dc13e1 100644
--- a/testsuites/psxtests/psxhdrs/Makefile.am
+++ b/testsuites/psxtests/psxhdrs/Makefile.am
@@ -91,10 +91,8 @@ 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
diff --git a/testsuites/psxtests/psxhdrs/time/clock_getenable_attr.c b/testsuites/psxtests/psxhdrs/time/clock_getenable_attr.c
deleted file mode 100644
index d3c73ba..0000000
--- a/testsuites/psxtests/psxhdrs/time/clock_getenable_attr.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 <time.h>
-
-#ifndef _POSIX_CPUTIME
-#error "rtems is supposed to have clock_getenable_attr"
-#endif
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have clock_getenable_attr"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  clockid_t  clock_id = 0;
-  int        attr;
-  int        result;
-
-  result = clock_getenable_attr( clock_id, &attr );
-
-  return result;
-}
diff --git a/testsuites/psxtests/psxhdrs/time/clock_setenable_attr.c b/testsuites/psxtests/psxhdrs/time/clock_setenable_attr.c
deleted file mode 100644
index 8d0bd70..0000000
--- a/testsuites/psxtests/psxhdrs/time/clock_setenable_attr.c
+++ /dev/null
@@ -1,40 +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 <time.h>
-
-#ifndef _POSIX_CPUTIME
-#error "rtems is supposed to have clock_setenable_attr"
-#endif
-#ifndef _POSIX_THREAD_CPUTIME
-#error "rtems is supposed to have clock_setenable_attr"
-#endif
-
-int test( void );
-
-int test( void )
-{
-  clockid_t  clock_id = 0;
-  int        attr;
-  int        result;
-
-  attr = CLOCK_ENABLED;
-  attr = CLOCK_DISABLED;
-
-  result = clock_setenable_attr( clock_id, attr );
-
-  return result;
-}