From 3cdac682c9436b37d0ddfc27ba72e7b5686275c2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 28 Jul 2011 21:06:43 +0000 Subject: 2011-07-28 Pawel Zagorski PR 1857/tests * Makefile.am, configure.ac: Add test where there is more than one thread at a priority with the executing thread being non-preemptive. * sp76/.cvsignore, sp76/Makefile.am, sp76/init.c, sp76/sp76.doc, sp76/sp76.scn: New files. --- testsuites/sptests/ChangeLog | 8 +++ testsuites/sptests/Makefile.am | 2 +- testsuites/sptests/configure.ac | 1 + testsuites/sptests/sp76/.cvsignore | 2 + testsuites/sptests/sp76/Makefile.am | 26 ++++++++++ testsuites/sptests/sp76/init.c | 101 ++++++++++++++++++++++++++++++++++++ testsuites/sptests/sp76/sp76.doc | 26 ++++++++++ testsuites/sptests/sp76/sp76.scn | 9 ++++ 8 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 testsuites/sptests/sp76/.cvsignore create mode 100644 testsuites/sptests/sp76/Makefile.am create mode 100644 testsuites/sptests/sp76/init.c create mode 100644 testsuites/sptests/sp76/sp76.doc create mode 100644 testsuites/sptests/sp76/sp76.scn (limited to 'testsuites') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index a002af1c97..4ab11b2365 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,11 @@ +2011-07-28 Pawel Zagorski + + PR 1857/tests + * Makefile.am, configure.ac: Add test where there is more than one + thread at a priority with the executing thread being non-preemptive. + * sp76/.cvsignore, sp76/Makefile.am, sp76/init.c, sp76/sp76.doc, + sp76/sp76.scn: New files. + 2011-07-28 Petr Benes PR 1858/testing diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index c2f6d8290f..332562b9a6 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -14,7 +14,7 @@ SUBDIRS = \ sp40 sp41 sp42 sp43 sp44 sp45 sp46 sp47 sp48 sp49 \ 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 \ + sp70 sp71 sp72 sp73 sp74 sp75 sp76 \ spassoc01 spchain spclockget spcoverage spobjgetnext \ spnotepad01 spprintk spprivenv01 sprbtree01 spsize spstkalloc \ spthreadq01 spwatchdog spwkspace \ diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 11875997ea..452c2a5d14 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -101,6 +101,7 @@ sp72/Makefile sp73/Makefile sp74/Makefile sp75/Makefile +sp76/Makefile spassoc01/Makefile spchain/Makefile spclockget/Makefile diff --git a/testsuites/sptests/sp76/.cvsignore b/testsuites/sptests/sp76/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/testsuites/sptests/sp76/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/testsuites/sptests/sp76/Makefile.am b/testsuites/sptests/sp76/Makefile.am new file mode 100644 index 0000000000..266caf09f0 --- /dev/null +++ b/testsuites/sptests/sp76/Makefile.am @@ -0,0 +1,26 @@ +## +## $Id$ +## + +MANAGERS = all + +rtems_tests_PROGRAMS = sp76 +sp76_SOURCES = init.c + +dist_rtems_tests_DATA = sp76.scn +dist_rtems_tests_DATA += sp76.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 = $(sp76_OBJECTS) $(sp76_LDADD) +LINK_LIBS = $(sp76_LDLIBS) + +sp76$(EXEEXT): $(sp76_OBJECTS) $(sp76_DEPENDENCIES) + @rm -f sp76$(EXEEXT) + $(make-exe) + +include $(top_srcdir)/../automake/local.am diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c new file mode 100644 index 0000000000..a7ef46a431 --- /dev/null +++ b/testsuites/sptests/sp76/init.c @@ -0,0 +1,101 @@ +/* + * COPYRIGHT (c) 2011. + * 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.com/license/LICENSE. + * + * $Id$ + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + +rtems_task Test_task( + rtems_task_argument index +) +{ + rtems_status_code status; + rtems_name name; + + status = rtems_object_get_classic_name( rtems_task_self(), &name ); + directive_failed( status, "rtems_object_get_classic_name" ); + + put_name( name, FALSE ); + puts( " - Successfully yielded it to higher priority task" ); + + puts( "*** END OF SP76 TEST ***" ); + rtems_test_exit( 0 ); +} + +rtems_task Init( + rtems_task_argument argument +) +{ + rtems_status_code status; + rtems_id id; + rtems_task_priority old; + + puts( "\n\n*** SP76 (YIELD) TEST ***" ); + + status = rtems_task_ident( RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id ); + directive_failed( status, "task ident" ); + + /* to make sure it is equal to TA2 */ + puts( "Set Init task priority = 2" ); + status = rtems_task_set_priority( id, 2, &old ); + directive_failed( status, "task priority" ); + + puts( "Create TA1 at higher priority task" ); + status = rtems_task_create( + rtems_build_name( 'T', 'A', '1', ' ' ), + 1, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &id + ); + directive_failed( status, "create 1" ); + + status = rtems_task_start( id, Test_task, 1 ); + directive_failed( status, "start 1" ); + + puts( "Create TA2 at equal priority task" ); + status = rtems_task_create( + rtems_build_name( 'T', 'A', '2', ' ' ), + 2, + RTEMS_MINIMUM_STACK_SIZE, + RTEMS_DEFAULT_MODES, + RTEMS_DEFAULT_ATTRIBUTES, + &id + ); + directive_failed( status, "create 2" ); + + status = rtems_task_start( id, Test_task, 1 ); + directive_failed( status, "start 2" ); + + puts( "Yield to TA1" ); + status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR ); + directive_failed( status, "yield" ); + + puts( "*** should now get here ***" ); +} + +/* configuration information */ +#include /* for device driver prototypes */ + +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER +#define CONFIGURE_APPLICATION_NEEDS_CONSOLE_DRIVER + +#define CONFIGURE_MAXIMUM_TASKS 3 +#define CONFIGURE_INIT_TASK_PRIORITY 2 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT +#include +/* end of file */ diff --git a/testsuites/sptests/sp76/sp76.doc b/testsuites/sptests/sp76/sp76.doc new file mode 100644 index 0000000000..e6bb42a823 --- /dev/null +++ b/testsuites/sptests/sp76/sp76.doc @@ -0,0 +1,26 @@ +# +# $Id$ +# +# COPYRIGHT (c) 2011. +# 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.com/license/LICENSE. +# + +This file describes the directives and concepts tested by this test set. + +test set name: sp76 + +directives: + + rtems_task_wake_after - yield case when non-preemptive + +concepts: + ++ This test is specifically designed to exercise the yield case when + a task is non-preemptive, a higher priority task is ready, and there + are multiple threads ready at the same priority as the non-preemptive + task. + ++ test where there is more than one thread at a priority with the executing thread being non-preemptive. Create a higher priority thread and then yield. sparc init task at priority 2, non-preemptive create task at priority 2 create task at priority 1 yield diff --git a/testsuites/sptests/sp76/sp76.scn b/testsuites/sptests/sp76/sp76.scn new file mode 100644 index 0000000000..c7e61d518d --- /dev/null +++ b/testsuites/sptests/sp76/sp76.scn @@ -0,0 +1,9 @@ + + +*** SP76 (YIELD) TEST *** +Set Init task priority = 2 +Create TA1 at higher priority task +Create TA2 at equal priority task +Yield to TA1 +TA1 - Successfully yielded it to higher priority task +*** END OF SP76 TEST *** -- cgit v1.2.3