[PATCH 19/33] spintrcritical06/spintrcritical07: Remove tests
Sebastian Huber
sebastian.huber at embedded-brains.de
Tue Jul 21 15:04:36 UTC 2020
These two tests check conditions which no longer exist in the thread
queue implementation. The are obsolete since the change to use
red-black trees for the priority queues.
---
testsuites/sptests/Makefile.am | 23 ---
testsuites/sptests/configure.ac | 2 -
testsuites/sptests/spintrcritical06/init.c | 2 -
.../spintrcritical06/spintrcritical06.doc | 28 ----
.../spintrcritical06/spintrcritical06.scn | 6 -
.../spintrcritical06/spintrcritical06impl.h | 145 ------------------
testsuites/sptests/spintrcritical07/init.c | 2 -
.../spintrcritical07/spintrcritical07.doc | 28 ----
.../spintrcritical07/spintrcritical07.scn | 6 -
9 files changed, 242 deletions(-)
delete mode 100644 testsuites/sptests/spintrcritical06/init.c
delete mode 100644 testsuites/sptests/spintrcritical06/spintrcritical06.doc
delete mode 100644 testsuites/sptests/spintrcritical06/spintrcritical06.scn
delete mode 100644 testsuites/sptests/spintrcritical06/spintrcritical06impl.h
delete mode 100644 testsuites/sptests/spintrcritical07/init.c
delete mode 100644 testsuites/sptests/spintrcritical07/spintrcritical07.doc
delete mode 100644 testsuites/sptests/spintrcritical07/spintrcritical07.scn
diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am
index 3bdb0fe232..bbfabbaa36 100644
--- a/testsuites/sptests/Makefile.am
+++ b/testsuites/sptests/Makefile.am
@@ -1236,29 +1236,6 @@ spintrcritical05_CPPFLAGS = $(AM_CPPFLAGS) \
-I$(top_srcdir)/spintrcritical_support
endif
-if TEST_spintrcritical06
-sp_tests += spintrcritical06
-sp_screens += spintrcritical06/spintrcritical06.scn
-sp_docs += spintrcritical06/spintrcritical06.doc
-spintrcritical06_SOURCES = spintrcritical06/init.c \
- spintrcritical_support/intrcritical.c \
- spintrcritical_support/intrcritical.h
-spintrcritical06_CPPFLAGS = $(AM_CPPFLAGS) \
- $(TEST_FLAGS_spintrcritical06) $(support_includes) \
- -I$(top_srcdir)/spintrcritical_support
-endif
-
-if TEST_spintrcritical07
-sp_tests += spintrcritical07
-sp_screens += spintrcritical07/spintrcritical07.scn
-sp_docs += spintrcritical07/spintrcritical07.doc
-spintrcritical07_SOURCES = spintrcritical07/init.c \
- spintrcritical_support/intrcritical.c
-spintrcritical07_CPPFLAGS = $(AM_CPPFLAGS) \
- $(TEST_FLAGS_spintrcritical07) $(support_includes) \
- -I$(top_srcdir)/spintrcritical_support
-endif
-
if TEST_spintrcritical08
sp_tests += spintrcritical08
sp_screens += spintrcritical08/spintrcritical08.scn
diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac
index 9476e3b0d7..460917dd04 100644
--- a/testsuites/sptests/configure.ac
+++ b/testsuites/sptests/configure.ac
@@ -174,8 +174,6 @@ RTEMS_TEST_CHECK([spintrcritical02])
RTEMS_TEST_CHECK([spintrcritical03])
RTEMS_TEST_CHECK([spintrcritical04])
RTEMS_TEST_CHECK([spintrcritical05])
-RTEMS_TEST_CHECK([spintrcritical06])
-RTEMS_TEST_CHECK([spintrcritical07])
RTEMS_TEST_CHECK([spintrcritical08])
RTEMS_TEST_CHECK([spintrcritical09])
RTEMS_TEST_CHECK([spintrcritical10])
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
deleted file mode 100644
index d8fedae772..0000000000
--- a/testsuites/sptests/spintrcritical06/init.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PRIORITY_NO_TIMEOUT_FORWARD
-#include "spintrcritical06impl.h"
diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06.doc b/testsuites/sptests/spintrcritical06/spintrcritical06.doc
deleted file mode 100644
index 6100a91218..0000000000
--- a/testsuites/sptests/spintrcritical06/spintrcritical06.doc
+++ /dev/null
@@ -1,28 +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: spintrcritical06
-
-directives:
-
- _Thread_queue_Enqueue_priority
- - interrupt synchronization
- rtems_task_restart
- _Thread_queue_Extract_priority
-
-concepts:
-
-+ Ensure that removing the "search task" from the thread queue while we
- are looping and enqueuing another works as expected. This case is where
- the TCB we are using as a current pointer is removed from the thread queue
- when we flash interrupts WHILE SEARCHING FORWARD.
-
-NOTE: There is no way to know this case is hit from a test perspective. The
- test just runs and we check the coverage report.
diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06.scn b/testsuites/sptests/spintrcritical06/spintrcritical06.scn
deleted file mode 100644
index fdcf91c4f1..0000000000
--- a/testsuites/sptests/spintrcritical06/spintrcritical06.scn
+++ /dev/null
@@ -1,6 +0,0 @@
-*** TEST INTERRUPT CRITICAL SECTION 06 ***
-Init - Trying to generate semaphore release from ISR while blocking
-Init - There is no way for the test to know if it hits the case
-Init - Variation is: Priority/Restart Search Task (Forward)
-Support - rtems_timer_create - creating timer 1
-*** END OF TEST INTERRUPT CRITICAL SECTION 06 ***
diff --git a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h b/testsuites/sptests/spintrcritical06/spintrcritical06impl.h
deleted file mode 100644
index f0424e3dc8..0000000000
--- a/testsuites/sptests/spintrcritical06/spintrcritical06impl.h
+++ /dev/null
@@ -1,145 +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 <tmacros.h>
-#include <intrcritical.h>
-
-/* forward declarations to avoid warnings */
-rtems_task Init(rtems_task_argument argument);
-rtems_timer_service_routine test_release_from_isr(rtems_id timer, void *arg);
-rtems_task Secondary_task(rtems_task_argument arg);
-
-/* common parameters */
-#define SEMAPHORE_ATTRIBUTES RTEMS_PRIORITY
-
-#if defined(PRIORITY_NO_TIMEOUT_FORWARD)
- #define TEST_NAME "6"
- #define TEST_STRING "Priority/Restart Search Task (Forward)"
-
- #define INIT_PRIORITY 2
- #define BLOCKER_PRIORITY 1
- #define SEMAPHORE_OBTAIN_TIMEOUT 2
-
-#elif defined(PRIORITY_NO_TIMEOUT_REVERSE)
- #define TEST_NAME "7"
- #define TEST_STRING "Priority/Restart Search Task (Backward)"
- #define INIT_PRIORITY 126
- #define BLOCKER_PRIORITY 127
- #define SEMAPHORE_OBTAIN_TIMEOUT 0
-
-#else
-
- #error "Test Mode not defined"
-#endif
-
-const char rtems_test_name[] = "SPINTRCRITICAL " TEST_NAME;
-
-rtems_id Secondary_task_id;
-rtems_id Semaphore;
-
-rtems_timer_service_routine test_release_from_isr(
- rtems_id timer,
- void *arg
-)
-{
- (void) rtems_task_restart( Secondary_task_id, 1 );
-}
-
-rtems_task Secondary_task(
- rtems_task_argument arg
-)
-{
- if ( arg )
- (void) rtems_semaphore_flush( Semaphore );
-
- (void) rtems_semaphore_obtain(
- Semaphore,
- RTEMS_DEFAULT_OPTIONS,
- RTEMS_NO_TIMEOUT
- );
-
- rtems_test_assert(0);
-}
-
-static bool test_body( void *arg )
-{
- (void) arg;
-
- rtems_semaphore_obtain(
- Semaphore,
- RTEMS_DEFAULT_OPTIONS,
- SEMAPHORE_OBTAIN_TIMEOUT
- );
-
- return false;
-}
-
-rtems_task Init(
- rtems_task_argument ignored
-)
-{
- rtems_status_code status;
-
- TEST_BEGIN();
-
- puts( "Init - Trying to generate semaphore release from ISR while blocking" );
- puts( "Init - There is no way for the test to know if it hits the case" );
- puts( "Init - Variation is: " TEST_STRING );
- status = rtems_semaphore_create(
- rtems_build_name( 'S', 'M', '1', ' ' ),
- 0,
- SEMAPHORE_ATTRIBUTES,
- RTEMS_NO_PRIORITY,
- &Semaphore
- );
- directive_failed( status, "rtems_semaphore_create of SM1" );
-
- status = rtems_task_create(
- rtems_build_name( 'B', 'L', 'C', 'K' ),
- BLOCKER_PRIORITY,
- RTEMS_MINIMUM_STACK_SIZE,
- RTEMS_NO_PREEMPT,
- RTEMS_DEFAULT_ATTRIBUTES,
- &Secondary_task_id
- );
- directive_failed( status, "rtems_task_create" );
-
- status = rtems_task_start( Secondary_task_id, Secondary_task, 0 );
- directive_failed( status, "rtems_task_start" );
-
- interrupt_critical_section_test( test_body, NULL, test_release_from_isr );
-
- TEST_END();
- rtems_test_exit(0);
-}
-
-/* configuration information */
-
-#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER
-#define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
-
-#define CONFIGURE_MAXIMUM_TASKS 2
-#define CONFIGURE_MAXIMUM_TIMERS 1
-#define CONFIGURE_MAXIMUM_SEMAPHORES 1
-#define CONFIGURE_MAXIMUM_USER_EXTENSIONS 1
-#define CONFIGURE_INIT_TASK_PRIORITY INIT_PRIORITY
-#define CONFIGURE_INIT_TASK_INITIAL_MODES RTEMS_PREEMPT
-#define CONFIGURE_MICROSECONDS_PER_TICK 2000
-#define CONFIGURE_INITIAL_EXTENSIONS RTEMS_TEST_INITIAL_EXTENSION
-
-#define CONFIGURE_RTEMS_INIT_TASKS_TABLE
-
-#define CONFIGURE_INIT
-#include <rtems/confdefs.h>
-
-/* global variables */
diff --git a/testsuites/sptests/spintrcritical07/init.c b/testsuites/sptests/spintrcritical07/init.c
deleted file mode 100644
index 0c4f2a7f78..0000000000
--- a/testsuites/sptests/spintrcritical07/init.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define PRIORITY_NO_TIMEOUT_REVERSE
-#include "../spintrcritical06/spintrcritical06impl.h"
diff --git a/testsuites/sptests/spintrcritical07/spintrcritical07.doc b/testsuites/sptests/spintrcritical07/spintrcritical07.doc
deleted file mode 100644
index 2d8e2cd045..0000000000
--- a/testsuites/sptests/spintrcritical07/spintrcritical07.doc
+++ /dev/null
@@ -1,28 +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: spintrcritical07
-
-directives:
-
- _Thread_queue_Enqueue_priority
- - interrupt synchronization
- rtems_task_restart
- _Thread_queue_Extract_priority
-
-concepts:
-
-+ Ensure that removing the "search task" from the thread queue while we
- are looping and enqueuing another works as expected. This case is where
- the TCB we are using as a current pointer is removed from the thread queue
- when we flash interrupts WHILE SEARCHING FORWARD.
-
-NOTE: There is no way to know this case is hit from a test perspective. The
- test just runs and we check the coverage report.
diff --git a/testsuites/sptests/spintrcritical07/spintrcritical07.scn b/testsuites/sptests/spintrcritical07/spintrcritical07.scn
deleted file mode 100644
index 0f6dd8a3a3..0000000000
--- a/testsuites/sptests/spintrcritical07/spintrcritical07.scn
+++ /dev/null
@@ -1,6 +0,0 @@
-*** TEST INTERRUPT CRITICAL SECTION 07 ***
-Init - Trying to generate semaphore release from ISR while blocking
-Init - There is no way for the test to know if it hits the case
-Init - Variation is: Priority/Restart Search Task (Backward)
-Support - rtems_timer_create - creating timer 1
-*** END OF TEST INTERRUPT CRITICAL SECTION 07 ***
--
2.26.2
More information about the devel
mailing list