From af4355459ee843fb984aafe22a7531e922ee753e Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Thu, 26 Oct 2017 13:59:11 +0200
Subject: tests: Remove TEST_INIT

The TEST_EXTERN is a used only by the system.h style tests and they use
CONFIGURE_INIT appropriately.

Update #3170.
Update #3199.
---
 testsuites/sptests/sp01/init.c               | 2 --
 testsuites/sptests/sp02/init.c               | 2 --
 testsuites/sptests/sp03/init.c               | 2 --
 testsuites/sptests/sp04/init.c               | 2 --
 testsuites/sptests/sp05/init.c               | 2 --
 testsuites/sptests/sp06/init.c               | 2 --
 testsuites/sptests/sp07/init.c               | 2 --
 testsuites/sptests/sp08/init.c               | 2 --
 testsuites/sptests/sp11/init.c               | 2 --
 testsuites/sptests/sp12/init.c               | 2 --
 testsuites/sptests/sp13/init.c               | 2 --
 testsuites/sptests/sp14/init.c               | 2 --
 testsuites/sptests/sp15/init.c               | 2 --
 testsuites/sptests/sp16/init.c               | 2 --
 testsuites/sptests/sp17/init.c               | 2 --
 testsuites/sptests/sp18/init.c               | 2 --
 testsuites/sptests/sp19/init.c               | 2 --
 testsuites/sptests/sp20/init.c               | 2 --
 testsuites/sptests/sp2038/init.c             | 2 --
 testsuites/sptests/sp21/init.c               | 2 --
 testsuites/sptests/sp22/init.c               | 2 --
 testsuites/sptests/sp23/init.c               | 2 --
 testsuites/sptests/sp24/init.c               | 2 --
 testsuites/sptests/sp25/init.c               | 2 --
 testsuites/sptests/sp26/init.c               | 2 --
 testsuites/sptests/sp27/init.c               | 2 --
 testsuites/sptests/sp29/init.c               | 2 --
 testsuites/sptests/sp30/init.c               | 2 --
 testsuites/sptests/sp31/init.c               | 2 --
 testsuites/sptests/sp32/init.c               | 2 --
 testsuites/sptests/sp33/init.c               | 2 --
 testsuites/sptests/sp34/changepri.c          | 2 --
 testsuites/sptests/sp35/priinv.c             | 2 --
 testsuites/sptests/sp36/strict_order_mut.c   | 2 --
 testsuites/sptests/sp37/init.c               | 2 --
 testsuites/sptests/sp38/init.c               | 2 --
 testsuites/sptests/sp40/init.c               | 2 --
 testsuites/sptests/sp41/init.c               | 2 --
 testsuites/sptests/sp42/init.c               | 2 --
 testsuites/sptests/sp43/init.c               | 2 --
 testsuites/sptests/sp44/init.c               | 2 --
 testsuites/sptests/sp45/init.c               | 2 --
 testsuites/sptests/sp46/init.c               | 2 --
 testsuites/sptests/sp47/init.c               | 2 --
 testsuites/sptests/sp48/init.c               | 2 --
 testsuites/sptests/sp49/init.c               | 2 --
 testsuites/sptests/sp50/init.c               | 2 --
 testsuites/sptests/sp51/init.c               | 2 --
 testsuites/sptests/sp52/init.c               | 2 --
 testsuites/sptests/sp54/init.c               | 2 --
 testsuites/sptests/sp55/init.c               | 2 --
 testsuites/sptests/sp56/init.c               | 2 --
 testsuites/sptests/sp57/init.c               | 2 --
 testsuites/sptests/sp58/init.c               | 2 --
 testsuites/sptests/sp59/init.c               | 2 --
 testsuites/sptests/sp60/init.c               | 2 --
 testsuites/sptests/sp62/init.c               | 2 --
 testsuites/sptests/sp63/init.c               | 2 --
 testsuites/sptests/sp64/init.c               | 2 --
 testsuites/sptests/sp65/init.c               | 2 --
 testsuites/sptests/sp67/init.c               | 2 --
 testsuites/sptests/sp68/init.c               | 2 --
 testsuites/sptests/sp69/init.c               | 2 --
 testsuites/sptests/sp70/init.c               | 2 --
 testsuites/sptests/sp71/init.c               | 2 --
 testsuites/sptests/sp72/init.c               | 2 --
 testsuites/sptests/sp73/init.c               | 2 --
 testsuites/sptests/sp74/init.c               | 2 --
 testsuites/sptests/sp75/init.c               | 2 --
 testsuites/sptests/sp76/init.c               | 2 --
 testsuites/sptests/sp77/init.c               | 2 --
 testsuites/sptests/spassoc01/init.c          | 2 --
 testsuites/sptests/spatomic01/init.c         | 2 --
 testsuites/sptests/spcache01/init.c          | 2 --
 testsuites/sptests/spcbssched01/init.c       | 2 --
 testsuites/sptests/spcbssched02/init.c       | 2 --
 testsuites/sptests/spcbssched03/init.c       | 2 --
 testsuites/sptests/spchain/init.c            | 2 --
 testsuites/sptests/spclock_err01/init.c      | 2 --
 testsuites/sptests/spclock_err02/init.c      | 2 --
 testsuites/sptests/spcontext01/init.c        | 2 --
 testsuites/sptests/spcoverage/init.c         | 2 --
 testsuites/sptests/spcpucounter01/init.c     | 2 --
 testsuites/sptests/spcpuset01/init.c         | 2 --
 testsuites/sptests/spedfsched01/init.c       | 2 --
 testsuites/sptests/spedfsched02/init.c       | 2 --
 testsuites/sptests/spedfsched03/init.c       | 2 --
 testsuites/sptests/spedfsched04/init.c       | 2 --
 testsuites/sptests/sperror01/init.c          | 2 --
 testsuites/sptests/sperror02/init.c          | 2 --
 testsuites/sptests/sperror03/init.c          | 2 --
 testsuites/sptests/spevent_err03/init.c      | 2 --
 testsuites/sptests/speventsystem01/init.c    | 2 --
 testsuites/sptests/speventtransient01/init.c | 2 --
 testsuites/sptests/spextensions01/init.c     | 2 --
 testsuites/sptests/spfatal26/init.c          | 2 --
 testsuites/sptests/spfatal30/init.c          | 2 --
 testsuites/sptests/spfatal31/init.c          | 2 --
 testsuites/sptests/spfatal_support/init.c    | 2 --
 testsuites/sptests/spfifo01/init.c           | 2 --
 testsuites/sptests/spfifo02/init.c           | 2 --
 testsuites/sptests/spfifo03/init.c           | 2 --
 testsuites/sptests/spfifo04/init.c           | 2 --
 testsuites/sptests/spfifo05/init.c           | 2 --
 testsuites/sptests/spfreechain01/init.c      | 2 --
 testsuites/sptests/spheapprot/init.c         | 2 --
 testsuites/sptests/spinternalerror01/init.c  | 2 --
 testsuites/sptests/spinternalerror02/init.c  | 2 --
 testsuites/sptests/spintr_err01/init.c       | 2 --
 testsuites/sptests/spintrcritical01/init.c   | 2 --
 testsuites/sptests/spintrcritical06/init.c   | 2 --
 testsuites/sptests/spintrcritical08/init.c   | 2 --
 testsuites/sptests/spintrcritical09/init.c   | 2 --
 testsuites/sptests/spintrcritical10/init.c   | 2 --
 testsuites/sptests/spintrcritical11/init.c   | 2 --
 testsuites/sptests/spintrcritical13/init.c   | 2 --
 testsuites/sptests/spintrcritical15/init.c   | 2 --
 testsuites/sptests/spintrcritical16/init.c   | 2 --
 testsuites/sptests/spintrcritical18/init.c   | 2 --
 testsuites/sptests/spintrcritical20/init.c   | 2 --
 testsuites/sptests/spintrcritical21/init.c   | 2 --
 testsuites/sptests/spintrcritical22/init.c   | 2 --
 testsuites/sptests/spintrcritical23/init.c   | 2 --
 testsuites/sptests/spintrcritical24/init.c   | 2 --
 testsuites/sptests/splinkersets01/init.c     | 2 --
 testsuites/sptests/spmkdir/init.c            | 2 --
 testsuites/sptests/spmountmgr01/init.c       | 2 --
 testsuites/sptests/spmrsp01/init.c           | 2 --
 testsuites/sptests/spmsgq_err01/init.c       | 2 --
 testsuites/sptests/spmsgq_err02/init.c       | 2 --
 testsuites/sptests/spmutex01/init.c          | 2 --
 testsuites/sptests/spnsext01/init.c          | 2 --
 testsuites/sptests/spobjgetnext/init.c       | 2 --
 testsuites/sptests/sppagesize/init.c         | 2 --
 testsuites/sptests/sppartition_err01/init.c  | 2 --
 testsuites/sptests/spport_err01/init.c       | 2 --
 testsuites/sptests/spprintk/init.c           | 2 --
 testsuites/sptests/spprivenv01/init.c        | 2 --
 testsuites/sptests/spprofiling01/init.c      | 2 --
 testsuites/sptests/spqreslib/init.c          | 2 --
 testsuites/sptests/spratemon_err01/init.c    | 2 --
 testsuites/sptests/sprbtree01/init.c         | 2 --
 testsuites/sptests/spregion_err01/init.c     | 2 --
 testsuites/sptests/sprmsched01/init.c        | 2 --
 testsuites/sptests/sprmsched02/init.c        | 2 --
 testsuites/sptests/spscheduler01/init.c      | 1 -
 testsuites/sptests/spsem01/init.c            | 2 --
 testsuites/sptests/spsem02/init.c            | 2 --
 testsuites/sptests/spsem03/init.c            | 2 --
 testsuites/sptests/spsem_err01/init.c        | 2 --
 testsuites/sptests/spsem_err02/init.c        | 2 --
 testsuites/sptests/spsignal_err01/init.c     | 2 --
 testsuites/sptests/spsimplesched01/init.c    | 2 --
 testsuites/sptests/spsimplesched02/init.c    | 2 --
 testsuites/sptests/spsimplesched03/init.c    | 2 --
 testsuites/sptests/spsize/init.c             | 2 --
 testsuites/sptests/spstdthreads01/init.c     | 2 --
 testsuites/sptests/spstkalloc/init.c         | 2 --
 testsuites/sptests/spstkalloc02/init.c       | 2 --
 testsuites/sptests/spsysinit01/init.c        | 2 --
 testsuites/sptests/spsyslock01/init.c        | 2 --
 testsuites/sptests/sptask_err01/init.c       | 2 --
 testsuites/sptests/sptask_err02/init.c       | 2 --
 testsuites/sptests/sptask_err03/init.c       | 2 --
 testsuites/sptests/sptask_err04/init.c       | 2 --
 testsuites/sptests/sptasknopreempt01/init.c  | 2 --
 testsuites/sptests/spthreadlife01/init.c     | 2 --
 testsuites/sptests/spthreadq01/init.c        | 2 --
 testsuites/sptests/sptimecounter01/init.c    | 2 --
 testsuites/sptests/sptimecounter02/init.c    | 2 --
 testsuites/sptests/sptimecounter03/init.c    | 2 --
 testsuites/sptests/sptimecounter04/init.c    | 2 --
 testsuites/sptests/sptimer_err01/init.c      | 2 --
 testsuites/sptests/sptimer_err02/init.c      | 2 --
 testsuites/sptests/sptimerserver01/init.c    | 2 --
 testsuites/sptests/sptimespec01/init.c       | 2 --
 testsuites/sptests/sptls01/init.c            | 2 --
 testsuites/sptests/sptls02/init.cc           | 2 --
 testsuites/sptests/sptls03/init.c            | 2 --
 testsuites/sptests/spwatchdog/init.c         | 2 --
 testsuites/sptests/spwkspace/init.c          | 2 --
 181 files changed, 361 deletions(-)

(limited to 'testsuites/sptests')

diff --git a/testsuites/sptests/sp01/init.c b/testsuites/sptests/sp01/init.c
index a726a02461..4d73804dbb 100644
--- a/testsuites/sptests/sp01/init.c
+++ b/testsuites/sptests/sp01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp02/init.c b/testsuites/sptests/sp02/init.c
index ffd330e77f..d7ff317497 100644
--- a/testsuites/sptests/sp02/init.c
+++ b/testsuites/sptests/sp02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp03/init.c b/testsuites/sptests/sp03/init.c
index a5b6d8038a..1f02eb666d 100644
--- a/testsuites/sptests/sp03/init.c
+++ b/testsuites/sptests/sp03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp04/init.c b/testsuites/sptests/sp04/init.c
index 31925795e8..e7bc79393d 100644
--- a/testsuites/sptests/sp04/init.c
+++ b/testsuites/sptests/sp04/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp05/init.c b/testsuites/sptests/sp05/init.c
index 52db2eaa03..7d95ee9775 100644
--- a/testsuites/sptests/sp05/init.c
+++ b/testsuites/sptests/sp05/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp06/init.c b/testsuites/sptests/sp06/init.c
index 60e7a41137..e8379ae8f9 100644
--- a/testsuites/sptests/sp06/init.c
+++ b/testsuites/sptests/sp06/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp07/init.c b/testsuites/sptests/sp07/init.c
index bfae5eb487..d5b606d12a 100644
--- a/testsuites/sptests/sp07/init.c
+++ b/testsuites/sptests/sp07/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp08/init.c b/testsuites/sptests/sp08/init.c
index 88c1445627..2364c70287 100644
--- a/testsuites/sptests/sp08/init.c
+++ b/testsuites/sptests/sp08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/sysstate.h>
diff --git a/testsuites/sptests/sp11/init.c b/testsuites/sptests/sp11/init.c
index 5b52ba9760..ee3f2e82e7 100644
--- a/testsuites/sptests/sp11/init.c
+++ b/testsuites/sptests/sp11/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp12/init.c b/testsuites/sptests/sp12/init.c
index fb7a5f8d07..0b9200440b 100644
--- a/testsuites/sptests/sp12/init.c
+++ b/testsuites/sptests/sp12/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp13/init.c b/testsuites/sptests/sp13/init.c
index ed244bcb1e..ffa2d1285d 100644
--- a/testsuites/sptests/sp13/init.c
+++ b/testsuites/sptests/sp13/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp14/init.c b/testsuites/sptests/sp14/init.c
index 5e3ef2360b..b0cedc264e 100644
--- a/testsuites/sptests/sp14/init.c
+++ b/testsuites/sptests/sp14/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp15/init.c b/testsuites/sptests/sp15/init.c
index e867a913d1..dcf8f95ace 100644
--- a/testsuites/sptests/sp15/init.c
+++ b/testsuites/sptests/sp15/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp16/init.c b/testsuites/sptests/sp16/init.c
index f9e5d0a97b..3b8543b7c0 100644
--- a/testsuites/sptests/sp16/init.c
+++ b/testsuites/sptests/sp16/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp17/init.c b/testsuites/sptests/sp17/init.c
index 0ee99c105e..4f7cba8142 100644
--- a/testsuites/sptests/sp17/init.c
+++ b/testsuites/sptests/sp17/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp18/init.c b/testsuites/sptests/sp18/init.c
index 4c9448fcee..5f39794318 100644
--- a/testsuites/sptests/sp18/init.c
+++ b/testsuites/sptests/sp18/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/libcsupport.h>
 
 #include <tmacros.h>
diff --git a/testsuites/sptests/sp19/init.c b/testsuites/sptests/sp19/init.c
index 9d8fea373d..f1b75c406a 100644
--- a/testsuites/sptests/sp19/init.c
+++ b/testsuites/sptests/sp19/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp20/init.c b/testsuites/sptests/sp20/init.c
index 8b831ba339..bf8afc7684 100644
--- a/testsuites/sptests/sp20/init.c
+++ b/testsuites/sptests/sp20/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp2038/init.c b/testsuites/sptests/sp2038/init.c
index 28c8cb1375..da7c23ef5d 100644
--- a/testsuites/sptests/sp2038/init.c
+++ b/testsuites/sptests/sp2038/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <time.h>
diff --git a/testsuites/sptests/sp21/init.c b/testsuites/sptests/sp21/init.c
index 9a2fec5b72..0eb453c974 100644
--- a/testsuites/sptests/sp21/init.c
+++ b/testsuites/sptests/sp21/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/devnull.h>
 #include <rtems/devzero.h>
diff --git a/testsuites/sptests/sp22/init.c b/testsuites/sptests/sp22/init.c
index 78e415d74e..23956e6c30 100644
--- a/testsuites/sptests/sp22/init.c
+++ b/testsuites/sptests/sp22/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp23/init.c b/testsuites/sptests/sp23/init.c
index a6b52c6ec6..e0ee2f97a0 100644
--- a/testsuites/sptests/sp23/init.c
+++ b/testsuites/sptests/sp23/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp24/init.c b/testsuites/sptests/sp24/init.c
index 8c50c3a9e7..b0e7f15628 100644
--- a/testsuites/sptests/sp24/init.c
+++ b/testsuites/sptests/sp24/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp25/init.c b/testsuites/sptests/sp25/init.c
index ba4f65b932..e744e5cfb6 100644
--- a/testsuites/sptests/sp25/init.c
+++ b/testsuites/sptests/sp25/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp26/init.c b/testsuites/sptests/sp26/init.c
index 6df979c352..0ac7157e7c 100644
--- a/testsuites/sptests/sp26/init.c
+++ b/testsuites/sptests/sp26/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp27/init.c b/testsuites/sptests/sp27/init.c
index a5459140f4..bb4630d2de 100644
--- a/testsuites/sptests/sp27/init.c
+++ b/testsuites/sptests/sp27/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 
diff --git a/testsuites/sptests/sp29/init.c b/testsuites/sptests/sp29/init.c
index 6f68275626..e65fbe3d45 100644
--- a/testsuites/sptests/sp29/init.c
+++ b/testsuites/sptests/sp29/init.c
@@ -8,8 +8,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <bsp.h>
 
diff --git a/testsuites/sptests/sp30/init.c b/testsuites/sptests/sp30/init.c
index deb1873843..616e4cd2a4 100644
--- a/testsuites/sptests/sp30/init.c
+++ b/testsuites/sptests/sp30/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp31/init.c b/testsuites/sptests/sp31/init.c
index 34a96519cc..020ec255be 100644
--- a/testsuites/sptests/sp31/init.c
+++ b/testsuites/sptests/sp31/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp32/init.c b/testsuites/sptests/sp32/init.c
index 86068a35c9..71cd46c001 100644
--- a/testsuites/sptests/sp32/init.c
+++ b/testsuites/sptests/sp32/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
 const char rtems_test_name[] = "SP 32";
diff --git a/testsuites/sptests/sp33/init.c b/testsuites/sptests/sp33/init.c
index d45d860899..d8e3c50ae3 100644
--- a/testsuites/sptests/sp33/init.c
+++ b/testsuites/sptests/sp33/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>  /* includes bsp.h, stdio, etc... */
 
 const char rtems_test_name[] = "SP 33";
diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
index d2bdd65ace..5000f693d3 100644
--- a/testsuites/sptests/sp34/changepri.c
+++ b/testsuites/sptests/sp34/changepri.c
@@ -25,8 +25,6 @@
 
 #define CONFIGURE_INIT
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
index 69f3ca399b..a6d252a84d 100644
--- a/testsuites/sptests/sp35/priinv.c
+++ b/testsuites/sptests/sp35/priinv.c
@@ -51,8 +51,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp36/strict_order_mut.c b/testsuites/sptests/sp36/strict_order_mut.c
index d49ee74248..db270caf41 100644
--- a/testsuites/sptests/sp36/strict_order_mut.c
+++ b/testsuites/sptests/sp36/strict_order_mut.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <stdio.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp37/init.c b/testsuites/sptests/sp37/init.c
index 13e9a33cd3..08d6285d3d 100644
--- a/testsuites/sptests/sp37/init.c
+++ b/testsuites/sptests/sp37/init.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp38/init.c b/testsuites/sptests/sp38/init.c
index 49c74c2e6d..d77d5d2a1c 100644
--- a/testsuites/sptests/sp38/init.c
+++ b/testsuites/sptests/sp38/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp40/init.c b/testsuites/sptests/sp40/init.c
index b923d9f194..44e8d45a03 100644
--- a/testsuites/sptests/sp40/init.c
+++ b/testsuites/sptests/sp40/init.c
@@ -15,8 +15,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/ioimpl.h>
diff --git a/testsuites/sptests/sp41/init.c b/testsuites/sptests/sp41/init.c
index e08019aea2..04b855b352 100644
--- a/testsuites/sptests/sp41/init.c
+++ b/testsuites/sptests/sp41/init.c
@@ -13,8 +13,6 @@
 
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/objectimpl.h>
diff --git a/testsuites/sptests/sp42/init.c b/testsuites/sptests/sp42/init.c
index 9260b7af39..f4be2a5ca2 100644
--- a/testsuites/sptests/sp42/init.c
+++ b/testsuites/sptests/sp42/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/testsuites/sptests/sp43/init.c b/testsuites/sptests/sp43/init.c
index 56c3985995..a0025353ec 100644
--- a/testsuites/sptests/sp43/init.c
+++ b/testsuites/sptests/sp43/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sp44/init.c b/testsuites/sptests/sp44/init.c
index 39b2f50392..5b11eadda5 100644
--- a/testsuites/sptests/sp44/init.c
+++ b/testsuites/sptests/sp44/init.c
@@ -9,8 +9,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/sp45/init.c b/testsuites/sptests/sp45/init.c
index 20b6119fc2..b8b43b4df4 100644
--- a/testsuites/sptests/sp45/init.c
+++ b/testsuites/sptests/sp45/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 45";
diff --git a/testsuites/sptests/sp46/init.c b/testsuites/sptests/sp46/init.c
index d66108aa2e..55653e0b3a 100644
--- a/testsuites/sptests/sp46/init.c
+++ b/testsuites/sptests/sp46/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/cpuuse.h>
 
diff --git a/testsuites/sptests/sp47/init.c b/testsuites/sptests/sp47/init.c
index 2c2b637c38..5d28303f19 100644
--- a/testsuites/sptests/sp47/init.c
+++ b/testsuites/sptests/sp47/init.c
@@ -6,8 +6,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 47";
diff --git a/testsuites/sptests/sp48/init.c b/testsuites/sptests/sp48/init.c
index a6bfa9da19..53d8245c23 100644
--- a/testsuites/sptests/sp48/init.c
+++ b/testsuites/sptests/sp48/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/sp49/init.c b/testsuites/sptests/sp49/init.c
index 0edbc4a558..64db98e11f 100644
--- a/testsuites/sptests/sp49/init.c
+++ b/testsuites/sptests/sp49/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 49";
diff --git a/testsuites/sptests/sp50/init.c b/testsuites/sptests/sp50/init.c
index abc5a75745..58a7be7501 100644
--- a/testsuites/sptests/sp50/init.c
+++ b/testsuites/sptests/sp50/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "pritime.h"
 
diff --git a/testsuites/sptests/sp51/init.c b/testsuites/sptests/sp51/init.c
index 51fa0064ab..1e8f9e5ceb 100644
--- a/testsuites/sptests/sp51/init.c
+++ b/testsuites/sptests/sp51/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 51";
diff --git a/testsuites/sptests/sp52/init.c b/testsuites/sptests/sp52/init.c
index 3069e24d4e..f7629a5d11 100644
--- a/testsuites/sptests/sp52/init.c
+++ b/testsuites/sptests/sp52/init.c
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <string.h>
 
diff --git a/testsuites/sptests/sp54/init.c b/testsuites/sptests/sp54/init.c
index e39999c6b6..3b0d4589a9 100644
--- a/testsuites/sptests/sp54/init.c
+++ b/testsuites/sptests/sp54/init.c
@@ -18,8 +18,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 54";
diff --git a/testsuites/sptests/sp55/init.c b/testsuites/sptests/sp55/init.c
index ebc1264d4d..ee06e84d76 100644
--- a/testsuites/sptests/sp55/init.c
+++ b/testsuites/sptests/sp55/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 55";
diff --git a/testsuites/sptests/sp56/init.c b/testsuites/sptests/sp56/init.c
index c383420126..c0ce3c007c 100644
--- a/testsuites/sptests/sp56/init.c
+++ b/testsuites/sptests/sp56/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 56";
diff --git a/testsuites/sptests/sp57/init.c b/testsuites/sptests/sp57/init.c
index 8e0be12c52..3003c2fa9c 100644
--- a/testsuites/sptests/sp57/init.c
+++ b/testsuites/sptests/sp57/init.c
@@ -17,8 +17,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 57";
diff --git a/testsuites/sptests/sp58/init.c b/testsuites/sptests/sp58/init.c
index b5fd843586..b61120320e 100644
--- a/testsuites/sptests/sp58/init.c
+++ b/testsuites/sptests/sp58/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <sys/types.h>
diff --git a/testsuites/sptests/sp59/init.c b/testsuites/sptests/sp59/init.c
index 100b5408fb..4120761acd 100644
--- a/testsuites/sptests/sp59/init.c
+++ b/testsuites/sptests/sp59/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 59";
diff --git a/testsuites/sptests/sp60/init.c b/testsuites/sptests/sp60/init.c
index baa8f2cc4b..b015ac1244 100644
--- a/testsuites/sptests/sp60/init.c
+++ b/testsuites/sptests/sp60/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 60";
diff --git a/testsuites/sptests/sp62/init.c b/testsuites/sptests/sp62/init.c
index cbe6c92bef..7df64df0d6 100644
--- a/testsuites/sptests/sp62/init.c
+++ b/testsuites/sptests/sp62/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <unistd.h>
 
diff --git a/testsuites/sptests/sp63/init.c b/testsuites/sptests/sp63/init.c
index a4d66391a0..6f1c837d84 100644
--- a/testsuites/sptests/sp63/init.c
+++ b/testsuites/sptests/sp63/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/heapimpl.h>
diff --git a/testsuites/sptests/sp64/init.c b/testsuites/sptests/sp64/init.c
index 76961f71f9..153a9f25f4 100644
--- a/testsuites/sptests/sp64/init.c
+++ b/testsuites/sptests/sp64/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/libcsupport.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp65/init.c b/testsuites/sptests/sp65/init.c
index f1fed6e4f0..09c64b9d0b 100644
--- a/testsuites/sptests/sp65/init.c
+++ b/testsuites/sptests/sp65/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <unistd.h>
 
diff --git a/testsuites/sptests/sp67/init.c b/testsuites/sptests/sp67/init.c
index fe05da224f..154e836f41 100644
--- a/testsuites/sptests/sp67/init.c
+++ b/testsuites/sptests/sp67/init.c
@@ -14,8 +14,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/sp68/init.c b/testsuites/sptests/sp68/init.c
index 9aa8dd2091..5642203b74 100644
--- a/testsuites/sptests/sp68/init.c
+++ b/testsuites/sptests/sp68/init.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 68";
diff --git a/testsuites/sptests/sp69/init.c b/testsuites/sptests/sp69/init.c
index 83f93cde26..c604c2de06 100644
--- a/testsuites/sptests/sp69/init.c
+++ b/testsuites/sptests/sp69/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sp70/init.c b/testsuites/sptests/sp70/init.c
index eafdde5c40..721e3b91a1 100644
--- a/testsuites/sptests/sp70/init.c
+++ b/testsuites/sptests/sp70/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp71/init.c b/testsuites/sptests/sp71/init.c
index 999a2e8626..eff6ba72d0 100644
--- a/testsuites/sptests/sp71/init.c
+++ b/testsuites/sptests/sp71/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp72/init.c b/testsuites/sptests/sp72/init.c
index b8561e0b22..5e2c8ab91d 100644
--- a/testsuites/sptests/sp72/init.c
+++ b/testsuites/sptests/sp72/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp73/init.c b/testsuites/sptests/sp73/init.c
index 261bf8bad2..8db5024fc5 100644
--- a/testsuites/sptests/sp73/init.c
+++ b/testsuites/sptests/sp73/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <inttypes.h>
 #include "tmacros.h"
diff --git a/testsuites/sptests/sp74/init.c b/testsuites/sptests/sp74/init.c
index a1f9e5647c..346c67662c 100644
--- a/testsuites/sptests/sp74/init.c
+++ b/testsuites/sptests/sp74/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 74";
diff --git a/testsuites/sptests/sp75/init.c b/testsuites/sptests/sp75/init.c
index 667e4616f2..e699e766c6 100644
--- a/testsuites/sptests/sp75/init.c
+++ b/testsuites/sptests/sp75/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sp76/init.c b/testsuites/sptests/sp76/init.c
index f414080155..daf55f1ede 100644
--- a/testsuites/sptests/sp76/init.c
+++ b/testsuites/sptests/sp76/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SP 76";
diff --git a/testsuites/sptests/sp77/init.c b/testsuites/sptests/sp77/init.c
index f645209194..c6ccacc3bc 100644
--- a/testsuites/sptests/sp77/init.c
+++ b/testsuites/sptests/sp77/init.c
@@ -7,8 +7,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spassoc01/init.c b/testsuites/sptests/spassoc01/init.c
index 959cd40e6c..ba3873ac0e 100644
--- a/testsuites/sptests/spassoc01/init.c
+++ b/testsuites/sptests/spassoc01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spatomic01/init.c b/testsuites/sptests/spatomic01/init.c
index e034fcc423..b5fa6c4a7a 100644
--- a/testsuites/sptests/spatomic01/init.c
+++ b/testsuites/sptests/spatomic01/init.c
@@ -18,8 +18,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/atomic.h>
 #include <stdio.h>
 #include <rtems.h>
diff --git a/testsuites/sptests/spcache01/init.c b/testsuites/sptests/spcache01/init.c
index 28cf8c00c3..52fa860b93 100644
--- a/testsuites/sptests/spcache01/init.c
+++ b/testsuites/sptests/spcache01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <inttypes.h>
 #include <setjmp.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spcbssched01/init.c b/testsuites/sptests/spcbssched01/init.c
index eb8a808d2a..be85bce85c 100644
--- a/testsuites/sptests/spcbssched01/init.c
+++ b/testsuites/sptests/spcbssched01/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spcbssched02/init.c b/testsuites/sptests/spcbssched02/init.c
index 3d92de2d68..acaf7a723d 100644
--- a/testsuites/sptests/spcbssched02/init.c
+++ b/testsuites/sptests/spcbssched02/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spcbssched03/init.c b/testsuites/sptests/spcbssched03/init.c
index 7b219054ca..55549151b8 100644
--- a/testsuites/sptests/spcbssched03/init.c
+++ b/testsuites/sptests/spcbssched03/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spchain/init.c b/testsuites/sptests/spchain/init.c
index aa5f91d2d1..8fa7ea087d 100644
--- a/testsuites/sptests/spchain/init.c
+++ b/testsuites/sptests/spchain/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/chain.h>
 
diff --git a/testsuites/sptests/spclock_err01/init.c b/testsuites/sptests/spclock_err01/init.c
index 7e02e5e277..087c8d4a05 100644
--- a/testsuites/sptests/spclock_err01/init.c
+++ b/testsuites/sptests/spclock_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spclock_err02/init.c b/testsuites/sptests/spclock_err02/init.c
index d87da5c2c3..7912ab8b21 100644
--- a/testsuites/sptests/spclock_err02/init.c
+++ b/testsuites/sptests/spclock_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spcontext01/init.c b/testsuites/sptests/spcontext01/init.c
index 6d2adce685..e093c50618 100644
--- a/testsuites/sptests/spcontext01/init.c
+++ b/testsuites/sptests/spcontext01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPCONTEXT 1";
diff --git a/testsuites/sptests/spcoverage/init.c b/testsuites/sptests/spcoverage/init.c
index 31fdb4bd62..a80acec7fe 100644
--- a/testsuites/sptests/spcoverage/init.c
+++ b/testsuites/sptests/spcoverage/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPCOVERAGE";
diff --git a/testsuites/sptests/spcpucounter01/init.c b/testsuites/sptests/spcpucounter01/init.c
index 1a582fa615..92f2e15c72 100644
--- a/testsuites/sptests/spcpucounter01/init.c
+++ b/testsuites/sptests/spcpucounter01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <inttypes.h>
 
diff --git a/testsuites/sptests/spcpuset01/init.c b/testsuites/sptests/spcpuset01/init.c
index 39518e279b..b13be4913d 100644
--- a/testsuites/sptests/spcpuset01/init.c
+++ b/testsuites/sptests/spcpuset01/init.c
@@ -6,8 +6,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include <rtems.h>
 #include <stdlib.h>
diff --git a/testsuites/sptests/spedfsched01/init.c b/testsuites/sptests/spedfsched01/init.c
index 303cdebc80..04fc5ca79c 100644
--- a/testsuites/sptests/spedfsched01/init.c
+++ b/testsuites/sptests/spedfsched01/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched02/init.c b/testsuites/sptests/spedfsched02/init.c
index 0e7f54dbf0..aa2798c251 100644
--- a/testsuites/sptests/spedfsched02/init.c
+++ b/testsuites/sptests/spedfsched02/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched03/init.c b/testsuites/sptests/spedfsched03/init.c
index 6163f9a43f..0c2425a37c 100644
--- a/testsuites/sptests/spedfsched03/init.c
+++ b/testsuites/sptests/spedfsched03/init.c
@@ -20,8 +20,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spedfsched04/init.c b/testsuites/sptests/spedfsched04/init.c
index 42b2b15cb6..bcaced994c 100644
--- a/testsuites/sptests/spedfsched04/init.c
+++ b/testsuites/sptests/spedfsched04/init.c
@@ -30,8 +30,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
index 3f7bd6a490..d2ccf0c9c7 100644
--- a/testsuites/sptests/sperror01/init.c
+++ b/testsuites/sptests/sperror01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
index 0c4c9f447d..abbe1c384f 100644
--- a/testsuites/sptests/sperror02/init.c
+++ b/testsuites/sptests/sperror02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include "test_support.h"
diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
index 48c0ae6e78..e0369518e9 100644
--- a/testsuites/sptests/sperror03/init.c
+++ b/testsuites/sptests/sperror03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spevent_err03/init.c b/testsuites/sptests/spevent_err03/init.c
index 1a1d33d0f4..b13960e16d 100644
--- a/testsuites/sptests/spevent_err03/init.c
+++ b/testsuites/sptests/spevent_err03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/speventsystem01/init.c b/testsuites/sptests/speventsystem01/init.c
index 6a02b85384..7fb2429bc2 100644
--- a/testsuites/sptests/speventsystem01/init.c
+++ b/testsuites/sptests/speventsystem01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/speventtransient01/init.c b/testsuites/sptests/speventtransient01/init.c
index 1473ea67c9..91d6ecfc18 100644
--- a/testsuites/sptests/speventtransient01/init.c
+++ b/testsuites/sptests/speventtransient01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c
index 377e4c3985..58000839c4 100644
--- a/testsuites/sptests/spextensions01/init.c
+++ b/testsuites/sptests/spextensions01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <assert.h>
diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
index ade4f0e173..1848659d6a 100644
--- a/testsuites/sptests/spfatal26/init.c
+++ b/testsuites/sptests/spfatal26/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <limits.h>
diff --git a/testsuites/sptests/spfatal30/init.c b/testsuites/sptests/spfatal30/init.c
index 9cf50a38a9..a02bf062f4 100644
--- a/testsuites/sptests/spfatal30/init.c
+++ b/testsuites/sptests/spfatal30/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spfatal31/init.c b/testsuites/sptests/spfatal31/init.c
index 0dce6719b1..5aab6630dc 100644
--- a/testsuites/sptests/spfatal31/init.c
+++ b/testsuites/sptests/spfatal31/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index b6de0d6401..f9b2ed37c1 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spfifo01/init.c b/testsuites/sptests/spfifo01/init.c
index 3c8dc480ee..0e0f67815b 100644
--- a/testsuites/sptests/spfifo01/init.c
+++ b/testsuites/sptests/spfifo01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/testsuites/sptests/spfifo02/init.c b/testsuites/sptests/spfifo02/init.c
index 671e6ff5fe..64724016a3 100644
--- a/testsuites/sptests/spfifo02/init.c
+++ b/testsuites/sptests/spfifo02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/spfifo03/init.c b/testsuites/sptests/spfifo03/init.c
index 7d940951dd..5aa48004ec 100644
--- a/testsuites/sptests/spfifo03/init.c
+++ b/testsuites/sptests/spfifo03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfifo04/init.c b/testsuites/sptests/spfifo04/init.c
index b7966d12f1..157b45c786 100644
--- a/testsuites/sptests/spfifo04/init.c
+++ b/testsuites/sptests/spfifo04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfifo05/init.c b/testsuites/sptests/spfifo05/init.c
index 522a45b428..ab3ed66f96 100644
--- a/testsuites/sptests/spfifo05/init.c
+++ b/testsuites/sptests/spfifo05/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <bsp.h>
 #include <tmacros.h>
 #include <stdio.h>
diff --git a/testsuites/sptests/spfreechain01/init.c b/testsuites/sptests/spfreechain01/init.c
index e741a9b058..6efcd93762 100644
--- a/testsuites/sptests/spfreechain01/init.c
+++ b/testsuites/sptests/spfreechain01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/score/chainimpl.h>
 #include <rtems/score/freechain.h>
diff --git a/testsuites/sptests/spheapprot/init.c b/testsuites/sptests/spheapprot/init.c
index d17bb9a105..114abebc20 100644
--- a/testsuites/sptests/spheapprot/init.c
+++ b/testsuites/sptests/spheapprot/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 230e4cd699..4ee70b94fa 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <bsp.h>
diff --git a/testsuites/sptests/spinternalerror02/init.c b/testsuites/sptests/spinternalerror02/init.c
index b1a34680a4..2ed4c955d8 100644
--- a/testsuites/sptests/spinternalerror02/init.c
+++ b/testsuites/sptests/spinternalerror02/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spintr_err01/init.c b/testsuites/sptests/spintr_err01/init.c
index afc195e7ed..9bc39bf4dc 100644
--- a/testsuites/sptests/spintr_err01/init.c
+++ b/testsuites/sptests/spintr_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spintrcritical01/init.c b/testsuites/sptests/spintrcritical01/init.c
index 255f827484..b7cfee42f8 100644
--- a/testsuites/sptests/spintrcritical01/init.c
+++ b/testsuites/sptests/spintrcritical01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical06/init.c b/testsuites/sptests/spintrcritical06/init.c
index 9015810a35..423e4b5fa7 100644
--- a/testsuites/sptests/spintrcritical06/init.c
+++ b/testsuites/sptests/spintrcritical06/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical08/init.c b/testsuites/sptests/spintrcritical08/init.c
index efe30c2c9e..1a7ed2d2e5 100644
--- a/testsuites/sptests/spintrcritical08/init.c
+++ b/testsuites/sptests/spintrcritical08/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/score/watchdogimpl.h>
diff --git a/testsuites/sptests/spintrcritical09/init.c b/testsuites/sptests/spintrcritical09/init.c
index bb495f6073..87c1c1aab3 100644
--- a/testsuites/sptests/spintrcritical09/init.c
+++ b/testsuites/sptests/spintrcritical09/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index b22b93849a..f7e372a46b 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -13,8 +13,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical11/init.c b/testsuites/sptests/spintrcritical11/init.c
index ee37bacfe7..2a3f83a315 100644
--- a/testsuites/sptests/spintrcritical11/init.c
+++ b/testsuites/sptests/spintrcritical11/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical13/init.c b/testsuites/sptests/spintrcritical13/init.c
index cd278542df..7069938191 100644
--- a/testsuites/sptests/spintrcritical13/init.c
+++ b/testsuites/sptests/spintrcritical13/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical15/init.c b/testsuites/sptests/spintrcritical15/init.c
index 5c8e46ff0a..72e4832769 100644
--- a/testsuites/sptests/spintrcritical15/init.c
+++ b/testsuites/sptests/spintrcritical15/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index c34828ac45..3657c0607f 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical18/init.c b/testsuites/sptests/spintrcritical18/init.c
index fa2ee6c120..f621d21280 100644
--- a/testsuites/sptests/spintrcritical18/init.c
+++ b/testsuites/sptests/spintrcritical18/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical20/init.c b/testsuites/sptests/spintrcritical20/init.c
index 8c1f3760ac..1697df426a 100644
--- a/testsuites/sptests/spintrcritical20/init.c
+++ b/testsuites/sptests/spintrcritical20/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spintrcritical21/init.c b/testsuites/sptests/spintrcritical21/init.c
index d5cf8e1aab..faa48f717c 100644
--- a/testsuites/sptests/spintrcritical21/init.c
+++ b/testsuites/sptests/spintrcritical21/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spintrcritical22/init.c b/testsuites/sptests/spintrcritical22/init.c
index c95929e2e8..7412bdef7e 100644
--- a/testsuites/sptests/spintrcritical22/init.c
+++ b/testsuites/sptests/spintrcritical22/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 #include <rtems/rtems/semimpl.h>
diff --git a/testsuites/sptests/spintrcritical23/init.c b/testsuites/sptests/spintrcritical23/init.c
index 019446d029..f71de71099 100644
--- a/testsuites/sptests/spintrcritical23/init.c
+++ b/testsuites/sptests/spintrcritical23/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <intrcritical.h>
 
diff --git a/testsuites/sptests/spintrcritical24/init.c b/testsuites/sptests/spintrcritical24/init.c
index 6303f9e91c..8f60c1ce70 100644
--- a/testsuites/sptests/spintrcritical24/init.c
+++ b/testsuites/sptests/spintrcritical24/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/testsuites/sptests/splinkersets01/init.c b/testsuites/sptests/splinkersets01/init.c
index 90d44d6afb..4e19c6e846 100644
--- a/testsuites/sptests/splinkersets01/init.c
+++ b/testsuites/sptests/splinkersets01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include "splinkersets01.h"
diff --git a/testsuites/sptests/spmkdir/init.c b/testsuites/sptests/spmkdir/init.c
index debe9881ef..6b016e3f1c 100644
--- a/testsuites/sptests/spmkdir/init.c
+++ b/testsuites/sptests/spmkdir/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/testsuites/sptests/spmountmgr01/init.c b/testsuites/sptests/spmountmgr01/init.c
index 798838ecba..2330ca82ba 100644
--- a/testsuites/sptests/spmountmgr01/init.c
+++ b/testsuites/sptests/spmountmgr01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <errno.h>
diff --git a/testsuites/sptests/spmrsp01/init.c b/testsuites/sptests/spmrsp01/init.c
index 2c01c2c91e..bf144a9775 100644
--- a/testsuites/sptests/spmrsp01/init.c
+++ b/testsuites/sptests/spmrsp01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/spmsgq_err01/init.c b/testsuites/sptests/spmsgq_err01/init.c
index 80a0c54f7a..24537725dc 100644
--- a/testsuites/sptests/spmsgq_err01/init.c
+++ b/testsuites/sptests/spmsgq_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 #define MESSAGE_SIZE (sizeof(long) * 4)
diff --git a/testsuites/sptests/spmsgq_err02/init.c b/testsuites/sptests/spmsgq_err02/init.c
index e64660ebe2..2ed5057007 100644
--- a/testsuites/sptests/spmsgq_err02/init.c
+++ b/testsuites/sptests/spmsgq_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c
index fd490e47b0..b9d4a05f73 100644
--- a/testsuites/sptests/spmutex01/init.c
+++ b/testsuites/sptests/spmutex01/init.c
@@ -27,8 +27,6 @@
 #include <pthread.h>
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPMUTEX 1";
diff --git a/testsuites/sptests/spnsext01/init.c b/testsuites/sptests/spnsext01/init.c
index 4ff2067592..1a10736611 100644
--- a/testsuites/sptests/spnsext01/init.c
+++ b/testsuites/sptests/spnsext01/init.c
@@ -16,8 +16,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPNSEXT 1";
diff --git a/testsuites/sptests/spobjgetnext/init.c b/testsuites/sptests/spobjgetnext/init.c
index 25ea1145e6..620185c1f3 100644
--- a/testsuites/sptests/spobjgetnext/init.c
+++ b/testsuites/sptests/spobjgetnext/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sppagesize/init.c b/testsuites/sptests/sppagesize/init.c
index 010c1c4a5d..04d735b84b 100644
--- a/testsuites/sptests/sppagesize/init.c
+++ b/testsuites/sptests/sppagesize/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems.h>
 #include <limits.h>
diff --git a/testsuites/sptests/sppartition_err01/init.c b/testsuites/sptests/sppartition_err01/init.c
index f53ebd2955..39ee700daa 100644
--- a/testsuites/sptests/sppartition_err01/init.c
+++ b/testsuites/sptests/sppartition_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spport_err01/init.c b/testsuites/sptests/spport_err01/init.c
index a6c95fca7d..20e66737b9 100644
--- a/testsuites/sptests/spport_err01/init.c
+++ b/testsuites/sptests/spport_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spprintk/init.c b/testsuites/sptests/spprintk/init.c
index 637ffe9d57..e956c76ff3 100644
--- a/testsuites/sptests/spprintk/init.c
+++ b/testsuites/sptests/spprintk/init.c
@@ -22,8 +22,6 @@
 #undef RTEMS_PRINTFLIKE
 #define RTEMS_PRINTFLIKE(_a, _b)
 
-#define TEST_INIT
-
 #include <rtems/bspIo.h>
 #include <tmacros.h>
 
diff --git a/testsuites/sptests/spprivenv01/init.c b/testsuites/sptests/spprivenv01/init.c
index 509d05ff19..88cf5e07af 100644
--- a/testsuites/sptests/spprivenv01/init.c
+++ b/testsuites/sptests/spprivenv01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/libio_.h>
diff --git a/testsuites/sptests/spprofiling01/init.c b/testsuites/sptests/spprofiling01/init.c
index a70343b21f..7a3b0e1736 100644
--- a/testsuites/sptests/spprofiling01/init.c
+++ b/testsuites/sptests/spprofiling01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/profiling.h>
 #include <rtems/bspIo.h>
 #include <rtems.h>
diff --git a/testsuites/sptests/spqreslib/init.c b/testsuites/sptests/spqreslib/init.c
index 2db540c9bc..d00b623043 100644
--- a/testsuites/sptests/spqreslib/init.c
+++ b/testsuites/sptests/spqreslib/init.c
@@ -16,8 +16,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spratemon_err01/init.c b/testsuites/sptests/spratemon_err01/init.c
index 92bf1f70b9..ccc2361295 100644
--- a/testsuites/sptests/spratemon_err01/init.c
+++ b/testsuites/sptests/spratemon_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sprbtree01/init.c b/testsuites/sptests/sprbtree01/init.c
index 6cb6ea0fdf..746b36ee3a 100644
--- a/testsuites/sptests/sprbtree01/init.c
+++ b/testsuites/sptests/sprbtree01/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include <rtems/rbtree.h>
 #include <rtems/score/rbtreeimpl.h>
diff --git a/testsuites/sptests/spregion_err01/init.c b/testsuites/sptests/spregion_err01/init.c
index 27fc3266a9..6dd8db63cf 100644
--- a/testsuites/sptests/spregion_err01/init.c
+++ b/testsuites/sptests/spregion_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sprmsched01/init.c b/testsuites/sptests/sprmsched01/init.c
index 2bdc44db6c..f806605ec8 100644
--- a/testsuites/sptests/sprmsched01/init.c
+++ b/testsuites/sptests/sprmsched01/init.c
@@ -31,8 +31,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include "test_support.h"
diff --git a/testsuites/sptests/sprmsched02/init.c b/testsuites/sptests/sprmsched02/init.c
index 235e91636b..4ee58ab5ec 100644
--- a/testsuites/sptests/sprmsched02/init.c
+++ b/testsuites/sptests/sprmsched02/init.c
@@ -10,8 +10,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/cpuuse.h>
 #include <tmacros.h>
 #include <rtems/rtems/ratemonimpl.h>
diff --git a/testsuites/sptests/spscheduler01/init.c b/testsuites/sptests/spscheduler01/init.c
index f8f84ac12d..c7e5518c57 100644
--- a/testsuites/sptests/spscheduler01/init.c
+++ b/testsuites/sptests/spscheduler01/init.c
@@ -16,7 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
 #define _GNU_SOURCE
 
 #include <rtems.h>
diff --git a/testsuites/sptests/spsem01/init.c b/testsuites/sptests/spsem01/init.c
index e0a7b93db4..924f4c052d 100644
--- a/testsuites/sptests/spsem01/init.c
+++ b/testsuites/sptests/spsem01/init.c
@@ -6,8 +6,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include <stdio.h>
diff --git a/testsuites/sptests/spsem02/init.c b/testsuites/sptests/spsem02/init.c
index f41f1ef74a..d5fb47b255 100644
--- a/testsuites/sptests/spsem02/init.c
+++ b/testsuites/sptests/spsem02/init.c
@@ -6,8 +6,6 @@
  * http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <rtems.h>
 
 #include <stdio.h>
diff --git a/testsuites/sptests/spsem03/init.c b/testsuites/sptests/spsem03/init.c
index 90f116ee43..859f996629 100644
--- a/testsuites/sptests/spsem03/init.c
+++ b/testsuites/sptests/spsem03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPSEM 3";
diff --git a/testsuites/sptests/spsem_err01/init.c b/testsuites/sptests/spsem_err01/init.c
index a1ed0e851f..39a366b41a 100644
--- a/testsuites/sptests/spsem_err01/init.c
+++ b/testsuites/sptests/spsem_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsem_err02/init.c b/testsuites/sptests/spsem_err02/init.c
index 48894dd5d8..4c0acb9039 100644
--- a/testsuites/sptests/spsem_err02/init.c
+++ b/testsuites/sptests/spsem_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsignal_err01/init.c b/testsuites/sptests/spsignal_err01/init.c
index 6a8e6d0692..6f8cd3ef60 100644
--- a/testsuites/sptests/spsignal_err01/init.c
+++ b/testsuites/sptests/spsignal_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spsimplesched01/init.c b/testsuites/sptests/spsimplesched01/init.c
index 87d801097c..6bac9c367a 100644
--- a/testsuites/sptests/spsimplesched01/init.c
+++ b/testsuites/sptests/spsimplesched01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSIMPLESCHED 1";
diff --git a/testsuites/sptests/spsimplesched02/init.c b/testsuites/sptests/spsimplesched02/init.c
index 4e78ab5eb7..884a3abf6f 100644
--- a/testsuites/sptests/spsimplesched02/init.c
+++ b/testsuites/sptests/spsimplesched02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems/score/threadimpl.h>
diff --git a/testsuites/sptests/spsimplesched03/init.c b/testsuites/sptests/spsimplesched03/init.c
index e0773647dc..2f352af88b 100644
--- a/testsuites/sptests/spsimplesched03/init.c
+++ b/testsuites/sptests/spsimplesched03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSIMPLESCHED 3";
diff --git a/testsuites/sptests/spsize/init.c b/testsuites/sptests/spsize/init.c
index 569594ce6d..c26ba06c70 100644
--- a/testsuites/sptests/spsize/init.c
+++ b/testsuites/sptests/spsize/init.c
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spstdthreads01/init.c b/testsuites/sptests/spstdthreads01/init.c
index 9f147daca6..4a9953cf8a 100644
--- a/testsuites/sptests/spstdthreads01/init.c
+++ b/testsuites/sptests/spstdthreads01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <threads.h>
diff --git a/testsuites/sptests/spstkalloc/init.c b/testsuites/sptests/spstkalloc/init.c
index 9df45095f1..4a26fdb9a6 100644
--- a/testsuites/sptests/spstkalloc/init.c
+++ b/testsuites/sptests/spstkalloc/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSTKALLOC";
diff --git a/testsuites/sptests/spstkalloc02/init.c b/testsuites/sptests/spstkalloc02/init.c
index cd818f2020..ae78b41480 100644
--- a/testsuites/sptests/spstkalloc02/init.c
+++ b/testsuites/sptests/spstkalloc02/init.c
@@ -24,8 +24,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 const char rtems_test_name[] = "SPSTKALLOC 2";
diff --git a/testsuites/sptests/spsysinit01/init.c b/testsuites/sptests/spsysinit01/init.c
index 337740dc28..d0d3042a44 100644
--- a/testsuites/sptests/spsysinit01/init.c
+++ b/testsuites/sptests/spsysinit01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/types.h>
diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c
index 63d18dca1e..815579a0d9 100644
--- a/testsuites/sptests/spsyslock01/init.c
+++ b/testsuites/sptests/spsyslock01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <sys/lock.h>
diff --git a/testsuites/sptests/sptask_err01/init.c b/testsuites/sptests/sptask_err01/init.c
index 52e601017a..b57e751aa6 100644
--- a/testsuites/sptests/sptask_err01/init.c
+++ b/testsuites/sptests/sptask_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err02/init.c b/testsuites/sptests/sptask_err02/init.c
index 84687928ae..dfdaf396d0 100644
--- a/testsuites/sptests/sptask_err02/init.c
+++ b/testsuites/sptests/sptask_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err03/init.c b/testsuites/sptests/sptask_err03/init.c
index 203bb1da4c..d28a601418 100644
--- a/testsuites/sptests/sptask_err03/init.c
+++ b/testsuites/sptests/sptask_err03/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptask_err04/init.c b/testsuites/sptests/sptask_err04/init.c
index a9e4ef766d..c9af611d27 100644
--- a/testsuites/sptests/sptask_err04/init.c
+++ b/testsuites/sptests/sptask_err04/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/sptasknopreempt01/init.c b/testsuites/sptests/sptasknopreempt01/init.c
index 159e21bc0e..4bd49b1d82 100644
--- a/testsuites/sptests/sptasknopreempt01/init.c
+++ b/testsuites/sptests/sptasknopreempt01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPTASKNOPREEMPT 1";
diff --git a/testsuites/sptests/spthreadlife01/init.c b/testsuites/sptests/spthreadlife01/init.c
index 04712c9f45..8bf26b9b72 100644
--- a/testsuites/sptests/spthreadlife01/init.c
+++ b/testsuites/sptests/spthreadlife01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems.h>
 #include <rtems/libcsupport.h>
 
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index 13fb36c76f..0b307542cf 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <rtems.h>
diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c
index 7c5274b91c..f56e8cf796 100644
--- a/testsuites/sptests/sptimecounter01/init.c
+++ b/testsuites/sptests/sptimecounter01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 #include <assert.h>
diff --git a/testsuites/sptests/sptimecounter02/init.c b/testsuites/sptests/sptimecounter02/init.c
index 3d24ff4a2e..4f8de6a034 100644
--- a/testsuites/sptests/sptimecounter02/init.c
+++ b/testsuites/sptests/sptimecounter02/init.c
@@ -20,8 +20,6 @@
 
 #define _KERNEL
 
-#define TEST_INIT
-
 #include <sys/time.h>
 #include <sys/timetc.h>
 
diff --git a/testsuites/sptests/sptimecounter03/init.c b/testsuites/sptests/sptimecounter03/init.c
index d6303ba62f..3b57d95a12 100644
--- a/testsuites/sptests/sptimecounter03/init.c
+++ b/testsuites/sptests/sptimecounter03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/test.h>
 
 #include <rtems/bsd.h>
diff --git a/testsuites/sptests/sptimecounter04/init.c b/testsuites/sptests/sptimecounter04/init.c
index 481f556520..72f2a138d5 100644
--- a/testsuites/sptests/sptimecounter04/init.c
+++ b/testsuites/sptests/sptimecounter04/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <time.h>
 #include <rtems.h>
 #include <rtems/test.h>
diff --git a/testsuites/sptests/sptimer_err01/init.c b/testsuites/sptests/sptimer_err01/init.c
index 1350bc9df3..35a6d7a1dd 100644
--- a/testsuites/sptests/sptimer_err01/init.c
+++ b/testsuites/sptests/sptimer_err01/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sptimer_err02/init.c b/testsuites/sptests/sptimer_err02/init.c
index a385ab98fd..ad25a16926 100644
--- a/testsuites/sptests/sptimer_err02/init.c
+++ b/testsuites/sptests/sptimer_err02/init.c
@@ -11,8 +11,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 
diff --git a/testsuites/sptests/sptimerserver01/init.c b/testsuites/sptests/sptimerserver01/init.c
index 0690012f01..88f1fb3cf3 100644
--- a/testsuites/sptests/sptimerserver01/init.c
+++ b/testsuites/sptests/sptimerserver01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include "tmacros.h"
 
 const char rtems_test_name[] = "SPTIMERSERVER 1";
diff --git a/testsuites/sptests/sptimespec01/init.c b/testsuites/sptests/sptimespec01/init.c
index 7115b8babb..945bd217ed 100644
--- a/testsuites/sptests/sptimespec01/init.c
+++ b/testsuites/sptests/sptimespec01/init.c
@@ -10,8 +10,6 @@
  *  http://www.rtems.org/license/LICENSE.
  */
 
-#define TEST_INIT
-
 #include <tmacros.h>
 #include "test_support.h"
 #include <rtems/timespec.h>
diff --git a/testsuites/sptests/sptls01/init.c b/testsuites/sptests/sptls01/init.c
index 9bbf97693d..ba662aa832 100644
--- a/testsuites/sptests/sptls01/init.c
+++ b/testsuites/sptests/sptls01/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/sptls02/init.cc b/testsuites/sptests/sptls02/init.cc
index fbdf53ec70..86e3158dc9 100644
--- a/testsuites/sptests/sptls02/init.cc
+++ b/testsuites/sptests/sptls02/init.cc
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/testsuites/sptests/sptls03/init.c b/testsuites/sptests/sptls03/init.c
index 71f2bea799..1487595981 100644
--- a/testsuites/sptests/sptls03/init.c
+++ b/testsuites/sptests/sptls03/init.c
@@ -16,8 +16,6 @@
   #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <rtems/score/thread.h>
 
 #include "tmacros.h"
diff --git a/testsuites/sptests/spwatchdog/init.c b/testsuites/sptests/spwatchdog/init.c
index 5ab6958d46..0c7d41fd33 100644
--- a/testsuites/sptests/spwatchdog/init.c
+++ b/testsuites/sptests/spwatchdog/init.c
@@ -19,8 +19,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #define CONFIGURE_INIT
 #include "system.h"
 
diff --git a/testsuites/sptests/spwkspace/init.c b/testsuites/sptests/spwkspace/init.c
index 8386daad2d..5131ebc189 100644
--- a/testsuites/sptests/spwkspace/init.c
+++ b/testsuites/sptests/spwkspace/init.c
@@ -13,8 +13,6 @@
 #include "config.h"
 #endif
 
-#define TEST_INIT
-
 #include <tmacros.h>
 
 #include <string.h>
-- 
cgit v1.2.3