summaryrefslogtreecommitdiffstats
path: root/testsuites/smptests
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--testsuites/smptests/smp05/init.c4
-rw-r--r--testsuites/smptests/smp07/init.c14
-rw-r--r--testsuites/smptests/smpfatal01/init.c10
-rw-r--r--testsuites/smptests/smpfatal02/init.c10
-rw-r--r--testsuites/smptests/smpfatal04/init.c8
-rw-r--r--testsuites/smptests/smpfatal05/init.c8
-rw-r--r--testsuites/smptests/smpfatal08/init.c8
7 files changed, 36 insertions, 26 deletions
diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c
index 424e9dffb2..31f77a3bbe 100644
--- a/testsuites/smptests/smp05/init.c
+++ b/testsuites/smptests/smp05/init.c
@@ -27,7 +27,7 @@ rtems_task Test_task(
static void success(void)
{
- rtems_test_end_with_plugin(locked_printf_plugin, NULL);
+ rtems_test_end();
rtems_test_exit( 0 );
}
@@ -50,7 +50,7 @@ rtems_task Init(
rtems_status_code status;
locked_print_initialize();
- rtems_test_begin_with_plugin(locked_printf_plugin, NULL);
+ rtems_test_begin();
if ( rtems_get_processor_count() == 1 ) {
success();
diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c
index c26669adbe..6acfe21642 100644
--- a/testsuites/smptests/smp07/init.c
+++ b/testsuites/smptests/smp07/init.c
@@ -18,7 +18,7 @@ const char rtems_test_name[] = "SMP 7";
volatile bool TaskRan = false;
volatile bool TSRFired = false;
-rtems_id Semaphore;
+rtems_id Semaphore;
rtems_task Init(
rtems_task_argument argument
@@ -30,7 +30,7 @@ rtems_task Test_task(
static void success(void)
{
- rtems_test_end_with_plugin(locked_printf_plugin, NULL);
+ rtems_test_end( );
rtems_test_exit( 0 );
}
@@ -63,8 +63,8 @@ rtems_task Test_task(
/* Print that the task is up and running. */
locked_printf(
- " CPU %" PRIu32 " running Task %s after semaphore release\n",
- cpu_num,
+ " CPU %" PRIu32 " running Task %s after semaphore release\n",
+ cpu_num,
name
);
@@ -98,7 +98,7 @@ rtems_task Init(
rtems_id Timer;
locked_print_initialize();
- rtems_test_begin_with_plugin(locked_printf_plugin, NULL);
+ rtems_test_begin();
if ( rtems_get_processor_count() == 1 ) {
success();
@@ -107,7 +107,7 @@ rtems_task Init(
/* Create/verify semaphore */
status = rtems_semaphore_create(
rtems_build_name ('S', 'E', 'M', '1'),
- 1,
+ 1,
RTEMS_LOCAL |
RTEMS_SIMPLE_BINARY_SEMAPHORE |
RTEMS_PRIORITY,
@@ -157,7 +157,7 @@ rtems_task Init(
if ( TSRFired && TaskRan )
break;
};
-
+
/* Validate the timer fired and that the task ran */
if ( !TSRFired )
locked_printf( "*** ERROR TSR DID NOT FIRE ***" );
diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c
index 9346d874db..e7f15973c5 100644
--- a/testsuites/smptests/smpfatal01/init.c
+++ b/testsuites/smptests/smpfatal01/init.c
@@ -16,8 +16,10 @@
#include "config.h"
#endif
+#define TESTS_USE_PRINTK
+#include "tmacros.h"
+
#include <rtems.h>
-#include <rtems/test.h>
#include <rtems/score/percpu.h>
#include <rtems/score/smpimpl.h>
#include <rtems/score/smpbarrier.h>
@@ -62,7 +64,7 @@ static void fatal_extension(
assert(state == PER_CPU_STATE_SHUTDOWN);
}
- rtems_test_endk();
+ TEST_END();
}
}
@@ -79,7 +81,7 @@ static rtems_status_code test_driver_init(
uint32_t cpu_count = rtems_get_processor_count();
uint32_t cpu;
- rtems_test_begink();
+ TEST_BEGIN();
assert(rtems_configuration_get_maximum_processors() == MAX_CPUS);
@@ -107,7 +109,7 @@ static rtems_status_code test_driver_init(
per_cpu->state = PER_CPU_STATE_SHUTDOWN;
} else {
- rtems_test_endk();
+ TEST_END();
exit(0);
}
diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c
index c98ff3c31a..71fff0c580 100644
--- a/testsuites/smptests/smpfatal02/init.c
+++ b/testsuites/smptests/smpfatal02/init.c
@@ -16,8 +16,10 @@
#include "config.h"
#endif
+#define TESTS_USE_PRINTK
+#include "tmacros.h"
+
#include <rtems.h>
-#include <rtems/test.h>
#include <rtems/score/percpu.h>
#include <rtems/score/smpimpl.h>
#include <rtems/score/smpbarrier.h>
@@ -67,7 +69,7 @@ static void fatal_extension(
assert(state == PER_CPU_STATE_SHUTDOWN);
}
- rtems_test_endk();
+ TEST_END();
} else {
assert(source == RTEMS_FATAL_SOURCE_SMP);
assert(code == SMP_FATAL_SHUTDOWN);
@@ -87,7 +89,7 @@ static rtems_status_code test_driver_init(
uint32_t cpu_count = rtems_get_processor_count();
uint32_t cpu;
- rtems_test_begink();
+ TEST_BEGIN();
assert(rtems_configuration_get_maximum_processors() == MAX_CPUS);
@@ -112,7 +114,7 @@ static rtems_status_code test_driver_init(
if (cpu_count > 1) {
rtems_fatal(RTEMS_FATAL_SOURCE_APPLICATION, 0xdeadbeef);
} else {
- rtems_test_endk();
+ TEST_END();
exit(0);
}
diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c
index 39ceebfd7b..ebfa849dbd 100644
--- a/testsuites/smptests/smpfatal04/init.c
+++ b/testsuites/smptests/smpfatal04/init.c
@@ -16,8 +16,10 @@
#include "config.h"
#endif
+#define TESTS_USE_PRINTK
+#include "tmacros.h"
+
#include <rtems.h>
-#include <rtems/test.h>
#include <rtems/score/smpimpl.h>
#include <assert.h>
@@ -36,14 +38,14 @@ static void fatal_extension(
rtems_fatal_code code
)
{
- rtems_test_begink();
+ TEST_BEGIN();
if (
source == RTEMS_FATAL_SOURCE_SMP
&& !is_internal
&& code == SMP_FATAL_BOOT_PROCESSOR_NOT_ASSIGNED_TO_SCHEDULER
) {
- rtems_test_endk();
+ TEST_END();
}
}
diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c
index 37b3deea4f..1e1e535863 100644
--- a/testsuites/smptests/smpfatal05/init.c
+++ b/testsuites/smptests/smpfatal05/init.c
@@ -16,8 +16,10 @@
#include "config.h"
#endif
+#define TESTS_USE_PRINTK
+#include "tmacros.h"
+
#include <rtems.h>
-#include <rtems/test.h>
#include <rtems/score/smpimpl.h>
#include <assert.h>
@@ -36,14 +38,14 @@ static void fatal_extension(
rtems_fatal_code code
)
{
- rtems_test_begink();
+ TEST_BEGIN();
if (
source == RTEMS_FATAL_SOURCE_SMP
&& !is_internal
&& code == SMP_FATAL_MANDATORY_PROCESSOR_NOT_PRESENT
) {
- rtems_test_endk();
+ TEST_END();
}
}
diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c
index 2de76e45a4..4b7aaf5156 100644
--- a/testsuites/smptests/smpfatal08/init.c
+++ b/testsuites/smptests/smpfatal08/init.c
@@ -16,8 +16,10 @@
#include "config.h"
#endif
+#define TESTS_USE_PRINTK
+#include "tmacros.h"
+
#include <rtems.h>
-#include <rtems/test.h>
#include <rtems/score/smpimpl.h>
#include <bsp.h>
@@ -93,14 +95,14 @@ static void fatal_extension(
rtems_fatal_code code
)
{
- rtems_test_begink();
+ TEST_BEGIN();
if (
source == RTEMS_FATAL_SOURCE_SMP
&& !is_internal
&& code == SMP_FATAL_START_OF_MANDATORY_PROCESSOR_FAILED
) {
- rtems_test_endk();
+ TEST_END();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 13:54:21 +0000