From e65c45c4b6cf6dfb485bef48385e39969de8b361 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 22 Mar 2016 17:13:30 -0500 Subject: Obsolete rtems_clock_get() directive. This service was marked as deprecated long prior to the 4.11 release series and is now being removed. closes #2676. --- testsuites/sptests/Makefile.am | 2 +- testsuites/sptests/configure.ac | 1 - testsuites/sptests/spclockget/Makefile.am | 22 ------- testsuites/sptests/spclockget/init.c | 99 ---------------------------- testsuites/sptests/spclockget/spclockget.doc | 19 ------ testsuites/sptests/spclockget/spclockget.scn | 8 --- 6 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 testsuites/sptests/spclockget/Makefile.am delete mode 100644 testsuites/sptests/spclockget/init.c delete mode 100644 testsuites/sptests/spclockget/spclockget.doc delete mode 100644 testsuites/sptests/spclockget/spclockget.scn (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 43f3d82794..f88e74af2d 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -11,7 +11,7 @@ _SUBDIRS = \ sp50 sp51 sp52 sp53 sp54 sp55 sp56 sp57 sp58 sp59 \ sp60 sp62 sp63 sp64 sp65 sp66 sp67 sp68 sp69 \ sp70 sp71 sp72 sp73 sp74 sp75 sp76 sp77 sp2038 \ - spassoc01 spchain spclockget spcoverage spobjgetnext \ + spassoc01 spchain spcoverage spobjgetnext \ spprintk spprivenv01 sprbtree01 spsize spstkalloc \ spstkalloc02 spthreadq01 spwatchdog spwkspace \ sperror01 sperror02 sperror03 \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index eeebc91171..208940651c 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -160,7 +160,6 @@ spcbssched01/Makefile spcbssched02/Makefile spcbssched03/Makefile spchain/Makefile -spclockget/Makefile spclock_err01/Makefile spclock_err02/Makefile spcoverage/Makefile diff --git a/testsuites/sptests/spclockget/Makefile.am b/testsuites/sptests/spclockget/Makefile.am deleted file mode 100644 index 5cf417cea9..0000000000 --- a/testsuites/sptests/spclockget/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ - -rtems_tests_PROGRAMS = spclockget -spclockget_SOURCES = init.c - -dist_rtems_tests_DATA = spclockget.scn -dist_rtems_tests_DATA += spclockget.doc - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(top_srcdir)/../automake/compile.am -include $(top_srcdir)/../automake/leaf.am - - -AM_CPPFLAGS += -I$(top_srcdir)/../support/include - -LINK_OBJS = $(spclockget_OBJECTS) -LINK_LIBS = $(spclockget_LDLIBS) - -spclockget$(EXEEXT): $(spclockget_OBJECTS) $(spclockget_DEPENDENCIES) - @rm -f spclockget$(EXEEXT) - $(make-exe) - -include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/spclockget/init.c b/testsuites/sptests/spclockget/init.c deleted file mode 100644 index 8cdae21cdb..0000000000 --- a/testsuites/sptests/spclockget/init.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * COPYRIGHT (c) 1989-2012. - * 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 -#include "pritime.h" - -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -const char rtems_test_name[] = "SPCLOCKGET"; - -/* forward declarations to avoid warnings */ -rtems_task Init(rtems_task_argument argument); - -rtems_task Init( - rtems_task_argument ignored -) -{ - rtems_status_code sc; - rtems_time_of_day time; - rtems_interval interval; - struct timeval timev; - - TEST_BEGIN(); - - puts( "Init - clock_set_time" ); - build_time( &time, 12, 31, 1988, 9, 0, 0, 0 ); - sc = rtems_clock_set( &time ); - directive_failed( sc, "rtems_clock_set" ); - - /* NULL parameter */ - sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, NULL ); - fatal_directive_status( sc, RTEMS_INVALID_ADDRESS, "null pointer" ); - puts( "TA1 - rtems_clock_get - RTEMS_INVALID_ADDRESS" ); - - /* arbitrary bad value for switch */ - sc = rtems_clock_get( 0xff, &timev ); - fatal_directive_status( sc, RTEMS_INVALID_NUMBER, "bad case" ); - puts( "TA1 - rtems_clock_get - RTEMS_INVALID_NUMBER" ); - - sc = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); - directive_failed( sc, "rtems_clock_get -- TOD" ); - print_time( "Init - rtems_clock_get - ", &time, "\n" ); - - sc = rtems_clock_get( RTEMS_CLOCK_GET_SECONDS_SINCE_EPOCH, &interval ); - directive_failed( sc, "rtems_clock_get -- Seconds Since Epoch" ); - printf( - "Init - rtems_clock_get - Seconds Since Epoch = %" PRIdrtems_interval "\n", - interval - ); - - sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_SINCE_BOOT, &interval ); - directive_failed( sc, "rtems_clock_get -- Ticks Since Boot" ); - printf( - "Init - rtems_clock_get - Ticks Since Boot = %" PRIdrtems_interval "\n", - interval - ); - - sc = rtems_clock_get( RTEMS_CLOCK_GET_TICKS_PER_SECOND, &interval ); - directive_failed( sc, "rtems_clock_get -- Ticks Per Second" ); - printf( - "Init - rtems_clock_get - Ticks Per Second = %" PRIdrtems_interval "\n", - interval - ); - - sc = rtems_clock_get( RTEMS_CLOCK_GET_TIME_VALUE, &timev ); - directive_failed( sc, "rtems_clock_get -- Time Value" ); - printf( - "Init - rtems_clock_get - Time Value = %" PRIdtime_t "\n", - timev.tv_sec - ); - - TEST_END(); - rtems_test_exit(0); -} - -/* configuration information */ - -#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER -#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER - -#define CONFIGURE_MAXIMUM_TASKS 1 -#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION - -#define CONFIGURE_RTEMS_INIT_TASKS_TABLE - -#define CONFIGURE_INIT -#include - -/* global variables */ diff --git a/testsuites/sptests/spclockget/spclockget.doc b/testsuites/sptests/spclockget/spclockget.doc deleted file mode 100644 index b5a6b28a04..0000000000 --- a/testsuites/sptests/spclockget/spclockget.doc +++ /dev/null @@ -1,19 +0,0 @@ -# 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. -# - -This file describes the directives and concepts tested by this test set. - -test set name: spclockget - -directives: - - rtems_clock_get() - LEGACY - -concepts: - -+ Exercise the legacy rtems_clock_get() method. diff --git a/testsuites/sptests/spclockget/spclockget.scn b/testsuites/sptests/spclockget/spclockget.scn deleted file mode 100644 index ce0d73f93a..0000000000 --- a/testsuites/sptests/spclockget/spclockget.scn +++ /dev/null @@ -1,8 +0,0 @@ -*** TEST LEGACY RTEMS_CLOCK_GET *** -Init - clock_set_time -Init - rtems_clock_get - 09:00:00 12/31/1988 -Init - rtems_clock_get - Seconds Since Epoch = 599562000 -Init - rtems_clock_get - Ticks Since Boot = 0 -Init - rtems_clock_get - Ticks Per Second = 100 -Init - rtems_clock_get - Time Value = 599562000 -*** END OF TEST LEGACY RTEMS_CLOCK_GET *** -- cgit v1.2.3