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/fstests/fsbdpart01/init.c | 2 ++ testsuites/fstests/fsclose01/init.c | 2 ++ testsuites/fstests/fsdosfsformat01/init.c | 2 ++ testsuites/fstests/fsdosfsname01/init.c | 2 ++ testsuites/fstests/fsdosfsname02/init.c | 2 ++ testsuites/fstests/fsdosfssync01/init.c | 2 ++ testsuites/fstests/fsdosfswrite01/init.c | 2 ++ testsuites/fstests/fsfseeko01/init.c | 2 ++ testsuites/fstests/fsimfsconfig01/init.c | 2 ++ testsuites/fstests/fsimfsconfig02/init.c | 2 ++ testsuites/fstests/fsimfsconfig03/init.c | 2 ++ testsuites/fstests/fsimfsgeneric01/init.c | 2 ++ testsuites/fstests/fsnofs01/init.c | 2 ++ testsuites/fstests/fsrofs01/init.c | 2 ++ testsuites/fstests/imfs_support/fs_support.c | 2 ++ testsuites/fstests/jffs2_support/fs_support.c | 2 ++ testsuites/fstests/mdosfs_support/fs_support.c | 2 ++ testsuites/fstests/mimfs_support/fs_support.c | 2 ++ testsuites/fstests/mrfs_support/fs_support.c | 2 ++ 19 files changed, 38 insertions(+) (limited to 'testsuites/fstests') diff --git a/testsuites/fstests/fsbdpart01/init.c b/testsuites/fstests/fsbdpart01/init.c index f339255469..ec0b3f6c7d 100644 --- a/testsuites/fstests/fsbdpart01/init.c +++ b/testsuites/fstests/fsbdpart01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsclose01/init.c b/testsuites/fstests/fsclose01/init.c index 77df082036..9e8a51e43c 100644 --- a/testsuites/fstests/fsclose01/init.c +++ b/testsuites/fstests/fsclose01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/fstests/fsdosfsformat01/init.c b/testsuites/fstests/fsdosfsformat01/init.c index b7df74883a..d84a80b195 100644 --- a/testsuites/fstests/fsdosfsformat01/init.c +++ b/testsuites/fstests/fsdosfsformat01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsdosfsname01/init.c b/testsuites/fstests/fsdosfsname01/init.c index f272945d89..ab01296291 100644 --- a/testsuites/fstests/fsdosfsname01/init.c +++ b/testsuites/fstests/fsdosfsname01/init.c @@ -17,6 +17,8 @@ #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsdosfsname02/init.c b/testsuites/fstests/fsdosfsname02/init.c index 0496ca00a4..bfb3bd315a 100644 --- a/testsuites/fstests/fsdosfsname02/init.c +++ b/testsuites/fstests/fsdosfsname02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include #include #include diff --git a/testsuites/fstests/fsdosfssync01/init.c b/testsuites/fstests/fsdosfssync01/init.c index c53d2ccc7b..2b27408438 100644 --- a/testsuites/fstests/fsdosfssync01/init.c +++ b/testsuites/fstests/fsdosfssync01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsdosfswrite01/init.c b/testsuites/fstests/fsdosfswrite01/init.c index 525a882d48..b787e3c37f 100644 --- a/testsuites/fstests/fsdosfswrite01/init.c +++ b/testsuites/fstests/fsdosfswrite01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include #include diff --git a/testsuites/fstests/fsfseeko01/init.c b/testsuites/fstests/fsfseeko01/init.c index dd073ce86a..ca6ce47381 100644 --- a/testsuites/fstests/fsfseeko01/init.c +++ b/testsuites/fstests/fsfseeko01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsimfsconfig01/init.c b/testsuites/fstests/fsimfsconfig01/init.c index 0a1cea59b7..57fd63c526 100644 --- a/testsuites/fstests/fsimfsconfig01/init.c +++ b/testsuites/fstests/fsimfsconfig01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsimfsconfig02/init.c b/testsuites/fstests/fsimfsconfig02/init.c index 35f9c83b58..07df21668f 100644 --- a/testsuites/fstests/fsimfsconfig02/init.c +++ b/testsuites/fstests/fsimfsconfig02/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsimfsconfig03/init.c b/testsuites/fstests/fsimfsconfig03/init.c index 352fb50577..311c5bb6b2 100644 --- a/testsuites/fstests/fsimfsconfig03/init.c +++ b/testsuites/fstests/fsimfsconfig03/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsimfsgeneric01/init.c b/testsuites/fstests/fsimfsgeneric01/init.c index 45d6d1cc2d..fff59e4ebf 100644 --- a/testsuites/fstests/fsimfsgeneric01/init.c +++ b/testsuites/fstests/fsimfsgeneric01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/fsnofs01/init.c b/testsuites/fstests/fsnofs01/init.c index 37ebac1771..603a906fdf 100644 --- a/testsuites/fstests/fsnofs01/init.c +++ b/testsuites/fstests/fsnofs01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #define TESTS_USE_PRINTK #include "tmacros.h" diff --git a/testsuites/fstests/fsrofs01/init.c b/testsuites/fstests/fsrofs01/init.c index 45aae88df9..323e275cb5 100644 --- a/testsuites/fstests/fsrofs01/init.c +++ b/testsuites/fstests/fsrofs01/init.c @@ -16,6 +16,8 @@ #include "config.h" #endif +#define TEST_INIT + #include "tmacros.h" #include diff --git a/testsuites/fstests/imfs_support/fs_support.c b/testsuites/fstests/imfs_support/fs_support.c index 966b01f121..53271fe94f 100644 --- a/testsuites/fstests/imfs_support/fs_support.c +++ b/testsuites/fstests/imfs_support/fs_support.c @@ -1,3 +1,5 @@ +#define TEST_INIT + /* * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). diff --git a/testsuites/fstests/jffs2_support/fs_support.c b/testsuites/fstests/jffs2_support/fs_support.c index da80de6304..18dbe20360 100644 --- a/testsuites/fstests/jffs2_support/fs_support.c +++ b/testsuites/fstests/jffs2_support/fs_support.c @@ -12,6 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/fstests/mdosfs_support/fs_support.c b/testsuites/fstests/mdosfs_support/fs_support.c index 1a07edf46f..b233a3374a 100644 --- a/testsuites/fstests/mdosfs_support/fs_support.c +++ b/testsuites/fstests/mdosfs_support/fs_support.c @@ -1,3 +1,5 @@ +#define TEST_INIT + /* * COPYRIGHT (c) 1989-2011. * On-Line Applications Research Corporation (OAR). diff --git a/testsuites/fstests/mimfs_support/fs_support.c b/testsuites/fstests/mimfs_support/fs_support.c index 7760ff7426..efcd5c4dcd 100644 --- a/testsuites/fstests/mimfs_support/fs_support.c +++ b/testsuites/fstests/mimfs_support/fs_support.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/testsuites/fstests/mrfs_support/fs_support.c b/testsuites/fstests/mrfs_support/fs_support.c index 11053505e5..85e1217044 100644 --- a/testsuites/fstests/mrfs_support/fs_support.c +++ b/testsuites/fstests/mrfs_support/fs_support.c @@ -7,6 +7,8 @@ * http://www.rtems.org/license/LICENSE. */ +#define TEST_INIT + #ifdef HAVE_CONFIG_H #include "config.h" #endif -- cgit v1.2.3