From 98c6d501452f02264ff148a1b8479e420c81562d Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 19 Oct 2017 16:39:16 +1100 Subject: testsuite: Use printk for all test output where possible. - Remove the printf support leaving the direct printk support configured with TESTS_USE_PRINTK and all other output goes via a buffered vsniprintf call to printk. - Control the test's single init for functions and global data with TEST_INIT and not CONFIGURE_INIT. They are now separate. Updates #3170. --- testsuites/smptests/smp01/init.c | 2 ++ testsuites/smptests/smp02/init.c | 2 ++ testsuites/smptests/smp03/init.c | 2 ++ testsuites/smptests/smp05/init.c | 2 ++ testsuites/smptests/smp07/init.c | 2 ++ testsuites/smptests/smp08/init.c | 2 ++ testsuites/smptests/smp09/init.c | 2 ++ testsuites/smptests/smpaffinity01/init.c | 2 ++ testsuites/smptests/smpatomic01/init.c | 2 ++ testsuites/smptests/smpcache01/init.c | 2 ++ testsuites/smptests/smpcapture01/init.c | 2 ++ testsuites/smptests/smpcapture02/init.c | 2 ++ testsuites/smptests/smpclock01/init.c | 2 ++ testsuites/smptests/smpfatal01/init.c | 2 ++ testsuites/smptests/smpfatal02/init.c | 2 ++ testsuites/smptests/smpfatal03/init.c | 2 ++ testsuites/smptests/smpfatal04/init.c | 2 ++ testsuites/smptests/smpfatal05/init.c | 2 ++ testsuites/smptests/smpfatal06/init.c | 2 ++ testsuites/smptests/smpfatal08/init.c | 2 ++ testsuites/smptests/smpipi01/init.c | 2 ++ testsuites/smptests/smpload01/init.c | 2 ++ testsuites/smptests/smplock01/init.c | 2 ++ testsuites/smptests/smpmigration01/init.c | 2 ++ testsuites/smptests/smpmigration02/init.c | 2 ++ testsuites/smptests/smpmrsp01/init.c | 2 ++ testsuites/smptests/smpmutex01/init.c | 2 ++ testsuites/smptests/smpmutex02/init.c | 2 ++ testsuites/smptests/smppsxaffinity01/init.c | 2 ++ testsuites/smptests/smppsxaffinity02/init.c | 2 ++ testsuites/smptests/smppsxmutex01/init.c | 2 ++ testsuites/smptests/smppsxsignal01/init.c | 2 ++ testsuites/smptests/smpschedaffinity01/init.c | 2 ++ testsuites/smptests/smpschedaffinity02/init.c | 2 ++ testsuites/smptests/smpschedaffinity03/init.c | 2 ++ testsuites/smptests/smpschedaffinity04/init.c | 2 ++ testsuites/smptests/smpschedaffinity05/init.c | 2 ++ testsuites/smptests/smpschededf01/init.c | 2 ++ testsuites/smptests/smpschededf02/init.c | 2 ++ testsuites/smptests/smpschededf03/init.c | 2 ++ testsuites/smptests/smpschedsem01/init.c | 2 ++ testsuites/smptests/smpscheduler01/init.c | 2 ++ testsuites/smptests/smpscheduler02/init.c | 2 ++ testsuites/smptests/smpscheduler04/init.c | 2 ++ testsuites/smptests/smpsignal01/init.c | 2 ++ testsuites/smptests/smpstrongapa01/init.c | 2 ++ testsuites/smptests/smpswitchextension01/init.c | 2 ++ testsuites/smptests/smpthreadlife01/init.c | 2 ++ testsuites/smptests/smpunsupported01/init.c | 2 ++ testsuites/smptests/smpwakeafter01/init.c | 2 ++ 50 files changed, 100 insertions(+) (limited to 'testsuites/smptests') diff --git a/testsuites/smptests/smp01/init.c b/testsuites/smptests/smp01/init.c index c77a192071..ef9d6b8180 100644 --- a/testsuites/smptests/smp01/init.c +++ b/testsuites/smptests/smp01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp02/init.c b/testsuites/smptests/smp02/init.c index e70eca3182..48d614810c 100644 --- a/testsuites/smptests/smp02/init.c +++ b/testsuites/smptests/smp02/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c index 03eddb0eaa..63383c4ff8 100644 --- a/testsuites/smptests/smp03/init.c +++ b/testsuites/smptests/smp03/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp05/init.c b/testsuites/smptests/smp05/init.c index 7211e8ca88..854c8febba 100644 --- a/testsuites/smptests/smp05/init.c +++ b/testsuites/smptests/smp05/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "test_support.h" diff --git a/testsuites/smptests/smp07/init.c b/testsuites/smptests/smp07/init.c index 0dbf70b001..9bf0529fc2 100644 --- a/testsuites/smptests/smp07/init.c +++ b/testsuites/smptests/smp07/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "test_support.h" diff --git a/testsuites/smptests/smp08/init.c b/testsuites/smptests/smp08/init.c index 85003929f5..fb58d70d12 100644 --- a/testsuites/smptests/smp08/init.c +++ b/testsuites/smptests/smp08/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #define CONFIGURE_INIT #include "system.h" diff --git a/testsuites/smptests/smp09/init.c b/testsuites/smptests/smp09/init.c index 66290641fd..4cb89de8ef 100644 --- a/testsuites/smptests/smp09/init.c +++ b/testsuites/smptests/smp09/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "test_support.h" #include diff --git a/testsuites/smptests/smpaffinity01/init.c b/testsuites/smptests/smpaffinity01/init.c index eae6d708db..c5a24c058b 100644 --- a/testsuites/smptests/smpaffinity01/init.c +++ b/testsuites/smptests/smpaffinity01/init.c @@ -13,6 +13,8 @@ #define NUM_CPUS 4 +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPAFFINITY 1"; diff --git a/testsuites/smptests/smpatomic01/init.c b/testsuites/smptests/smpatomic01/init.c index 394cc3f865..a780c69b34 100644 --- a/testsuites/smptests/smpatomic01/init.c +++ b/testsuites/smptests/smpatomic01/init.c @@ -18,6 +18,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpcache01/init.c b/testsuites/smptests/smpcache01/init.c index 73e30a13f2..ee752c78bd 100644 --- a/testsuites/smptests/smpcache01/init.c +++ b/testsuites/smptests/smpcache01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c index 2818b91cf1..2650f24fa0 100644 --- a/testsuites/smptests/smpcapture01/init.c +++ b/testsuites/smptests/smpcapture01/init.c @@ -25,6 +25,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smpcapture02/init.c b/testsuites/smptests/smpcapture02/init.c index 9926fbb493..efcb236522 100644 --- a/testsuites/smptests/smpcapture02/init.c +++ b/testsuites/smptests/smpcapture02/init.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpclock01/init.c b/testsuites/smptests/smpclock01/init.c index 5972959b66..a4128e436c 100644 --- a/testsuites/smptests/smpclock01/init.c +++ b/testsuites/smptests/smpclock01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpfatal01/init.c b/testsuites/smptests/smpfatal01/init.c index 2a000a5bf8..68ba68cbfa 100644 --- a/testsuites/smptests/smpfatal01/init.c +++ b/testsuites/smptests/smpfatal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal02/init.c b/testsuites/smptests/smpfatal02/init.c index fc25808d56..0b2424571f 100644 --- a/testsuites/smptests/smpfatal02/init.c +++ b/testsuites/smptests/smpfatal02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal03/init.c b/testsuites/smptests/smpfatal03/init.c index 47f8598387..8121fd29ae 100644 --- a/testsuites/smptests/smpfatal03/init.c +++ b/testsuites/smptests/smpfatal03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal04/init.c b/testsuites/smptests/smpfatal04/init.c index 73ef701c70..93d6bf1240 100644 --- a/testsuites/smptests/smpfatal04/init.c +++ b/testsuites/smptests/smpfatal04/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal05/init.c b/testsuites/smptests/smpfatal05/init.c index 6b0954a7bb..b07c986af6 100644 --- a/testsuites/smptests/smpfatal05/init.c +++ b/testsuites/smptests/smpfatal05/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal06/init.c b/testsuites/smptests/smpfatal06/init.c index 37cd9afe5a..94e6cf7e32 100644 --- a/testsuites/smptests/smpfatal06/init.c +++ b/testsuites/smptests/smpfatal06/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpfatal08/init.c b/testsuites/smptests/smpfatal08/init.c index 92f769a704..f4adc3279b 100644 --- a/testsuites/smptests/smpfatal08/init.c +++ b/testsuites/smptests/smpfatal08/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/smptests/smpipi01/init.c b/testsuites/smptests/smpipi01/init.c index cc85388f7c..b2f232eb68 100644 --- a/testsuites/smptests/smpipi01/init.c +++ b/testsuites/smptests/smpipi01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpload01/init.c b/testsuites/smptests/smpload01/init.c index 0e102354d4..778c3dc0f1 100644 --- a/testsuites/smptests/smpload01/init.c +++ b/testsuites/smptests/smpload01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smplock01/init.c b/testsuites/smptests/smplock01/init.c index 0a379154f5..38a3d0aebf 100644 --- a/testsuites/smptests/smplock01/init.c +++ b/testsuites/smptests/smplock01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpmigration01/init.c b/testsuites/smptests/smpmigration01/init.c index 6cde34b234..72033501e7 100644 --- a/testsuites/smptests/smpmigration01/init.c +++ b/testsuites/smptests/smpmigration01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTF #include "tmacros.h" diff --git a/testsuites/smptests/smpmigration02/init.c b/testsuites/smptests/smpmigration02/init.c index 4180f5387f..15e5d6e6ab 100644 --- a/testsuites/smptests/smpmigration02/init.c +++ b/testsuites/smptests/smpmigration02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpmrsp01/init.c b/testsuites/smptests/smpmrsp01/init.c index cc955678b6..9da101e50a 100644 --- a/testsuites/smptests/smpmrsp01/init.c +++ b/testsuites/smptests/smpmrsp01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smpmutex01/init.c b/testsuites/smptests/smpmutex01/init.c index c7059e8e14..ead95cfe7d 100644 --- a/testsuites/smptests/smpmutex01/init.c +++ b/testsuites/smptests/smpmutex01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPMUTEX 1"; diff --git a/testsuites/smptests/smpmutex02/init.c b/testsuites/smptests/smpmutex02/init.c index 1604bb7cf8..f902d8843d 100644 --- a/testsuites/smptests/smpmutex02/init.c +++ b/testsuites/smptests/smpmutex02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smppsxaffinity01/init.c b/testsuites/smptests/smppsxaffinity01/init.c index 58e1db5435..0178071f77 100644 --- a/testsuites/smptests/smppsxaffinity01/init.c +++ b/testsuites/smptests/smppsxaffinity01/init.c @@ -13,6 +13,8 @@ #define _GNU_SOURCE +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smppsxaffinity02/init.c b/testsuites/smptests/smppsxaffinity02/init.c index 21a723d41b..1b4bd59240 100644 --- a/testsuites/smptests/smppsxaffinity02/init.c +++ b/testsuites/smptests/smppsxaffinity02/init.c @@ -15,6 +15,8 @@ #define _GNU_SOURCE +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smppsxmutex01/init.c b/testsuites/smptests/smppsxmutex01/init.c index aeed75c6d1..67ff99c45f 100644 --- a/testsuites/smptests/smppsxmutex01/init.c +++ b/testsuites/smptests/smppsxmutex01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smppsxsignal01/init.c b/testsuites/smptests/smppsxsignal01/init.c index 367615838c..2c4687dfbb 100644 --- a/testsuites/smptests/smppsxsignal01/init.c +++ b/testsuites/smptests/smppsxsignal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpschedaffinity01/init.c b/testsuites/smptests/smpschedaffinity01/init.c index 778fda7ba0..d25d7e0c21 100644 --- a/testsuites/smptests/smpschedaffinity01/init.c +++ b/testsuites/smptests/smpschedaffinity01/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity02/init.c b/testsuites/smptests/smpschedaffinity02/init.c index 9a8cfed7dd..6e40c8e29d 100644 --- a/testsuites/smptests/smpschedaffinity02/init.c +++ b/testsuites/smptests/smpschedaffinity02/init.c @@ -21,6 +21,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity03/init.c b/testsuites/smptests/smpschedaffinity03/init.c index a53b30caa7..4036217fef 100644 --- a/testsuites/smptests/smpschedaffinity03/init.c +++ b/testsuites/smptests/smpschedaffinity03/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity04/init.c b/testsuites/smptests/smpschedaffinity04/init.c index c7a071f054..2a504f92c0 100644 --- a/testsuites/smptests/smpschedaffinity04/init.c +++ b/testsuites/smptests/smpschedaffinity04/init.c @@ -15,6 +15,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "tmacros.h" diff --git a/testsuites/smptests/smpschedaffinity05/init.c b/testsuites/smptests/smpschedaffinity05/init.c index 1d69592879..d2c897a442 100644 --- a/testsuites/smptests/smpschedaffinity05/init.c +++ b/testsuites/smptests/smpschedaffinity05/init.c @@ -24,6 +24,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smpschededf01/init.c b/testsuites/smptests/smpschededf01/init.c index d6e68b5465..2bfcadfef8 100644 --- a/testsuites/smptests/smpschededf01/init.c +++ b/testsuites/smptests/smpschededf01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpschededf02/init.c b/testsuites/smptests/smpschededf02/init.c index e0c5182f2e..17976fbb3f 100644 --- a/testsuites/smptests/smpschededf02/init.c +++ b/testsuites/smptests/smpschededf02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpschededf03/init.c b/testsuites/smptests/smpschededf03/init.c index 33029532c6..3a1f2708e3 100644 --- a/testsuites/smptests/smpschededf03/init.c +++ b/testsuites/smptests/smpschededf03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpschedsem01/init.c b/testsuites/smptests/smpschedsem01/init.c index cae5d6e84a..75173e3142 100644 --- a/testsuites/smptests/smpschedsem01/init.c +++ b/testsuites/smptests/smpschedsem01/init.c @@ -11,6 +11,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include "tmacros.h" diff --git a/testsuites/smptests/smpscheduler01/init.c b/testsuites/smptests/smpscheduler01/init.c index 5df3281e25..9f0b5c1ed2 100644 --- a/testsuites/smptests/smpscheduler01/init.c +++ b/testsuites/smptests/smpscheduler01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smpscheduler02/init.c b/testsuites/smptests/smpscheduler02/init.c index 5cd378315a..1107fad759 100644 --- a/testsuites/smptests/smpscheduler02/init.c +++ b/testsuites/smptests/smpscheduler02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include diff --git a/testsuites/smptests/smpscheduler04/init.c b/testsuites/smptests/smpscheduler04/init.c index a4e9da1289..2515e17a2f 100644 --- a/testsuites/smptests/smpscheduler04/init.c +++ b/testsuites/smptests/smpscheduler04/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/smptests/smpsignal01/init.c b/testsuites/smptests/smpsignal01/init.c index 52f2edbddd..af66c26fd7 100644 --- a/testsuites/smptests/smpsignal01/init.c +++ b/testsuites/smptests/smpsignal01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPSIGNAL 1"; diff --git a/testsuites/smptests/smpstrongapa01/init.c b/testsuites/smptests/smpstrongapa01/init.c index 75ac79bc54..d59714fda7 100644 --- a/testsuites/smptests/smpstrongapa01/init.c +++ b/testsuites/smptests/smpstrongapa01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpswitchextension01/init.c b/testsuites/smptests/smpswitchextension01/init.c index 3fad1d927c..c415863373 100644 --- a/testsuites/smptests/smpswitchextension01/init.c +++ b/testsuites/smptests/smpswitchextension01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpthreadlife01/init.c b/testsuites/smptests/smpthreadlife01/init.c index 5c2d106d0f..f224dd9223 100644 --- a/testsuites/smptests/smpthreadlife01/init.c +++ b/testsuites/smptests/smpthreadlife01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/smptests/smpunsupported01/init.c b/testsuites/smptests/smpunsupported01/init.c index a5ccaae271..56212a49d6 100644 --- a/testsuites/smptests/smpunsupported01/init.c +++ b/testsuites/smptests/smpunsupported01/init.c @@ -17,6 +17,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" const char rtems_test_name[] = "SMPUNSUPPORTED 1"; diff --git a/testsuites/smptests/smpwakeafter01/init.c b/testsuites/smptests/smpwakeafter01/init.c index 3d091f59c0..d6770590eb 100644 --- a/testsuites/smptests/smpwakeafter01/init.c +++ b/testsuites/smptests/smpwakeafter01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include -- cgit v1.2.3