From bcd0c06c9be41f68d41c2fc1ed9408410b9084a3 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Wed, 8 Nov 2017 08:25:36 +1100
Subject: tests: Use rtems_test_begin and rtems_test_end.

Add a tests enum and move all test banner test to the library in libmisc.

Update #3199.
---
 testsuites/support/include/buffer_test_io.h | 45 ++---------------------------
 1 file changed, 2 insertions(+), 43 deletions(-)

(limited to 'testsuites/support/include')

diff --git a/testsuites/support/include/buffer_test_io.h b/testsuites/support/include/buffer_test_io.h
index 1ff15f6ca8..8fbcd68b3e 100644
--- a/testsuites/support/include/buffer_test_io.h
+++ b/testsuites/support/include/buffer_test_io.h
@@ -11,28 +11,6 @@
 extern "C" {
 #endif
 
-/*
- * Test states. No state string is an expected pass.
- */
-#if (TEST_STATE_EXPECTED_FAIL && TEST_STATE_USER_INPUT) || \
-    (TEST_STATE_EXPECTED_FAIL && TEST_STATE_INDETERMINATE) || \
-    (TEST_STATE_EXPECTED_FAIL && TEST_STATE_BENCHMARK) || \
-    (TEST_STATE_USER_INPUT    && TEST_STATE_INDETERMINATE) || \
-    (TEST_STATE_USER_INPUT    && TEST_STATE_BENCHMARK) || \
-    (TEST_STATE_INDETERMINATE && TEST_STATE_BENCHMARK)
-  #error Test states must be unique
-#endif
-
-#if TEST_STATE_EXPECTED_FAIL
-  #define TEST_STATE_STRING "*** TEST STATE: EXPECTED-FAIL\n"
-#elif TEST_STATE_USER_INPUT
-  #define TEST_STATE_STRING "*** TEST STATE: USER_INPUT\n"
-#elif TEST_STATE_INDETERMINATE
-  #define TEST_STATE_STRING "*** TEST STATE: INDETERMINATE\n"
-#elif TEST_STATE_BENCHMARK
-  #define TEST_STATE_STRING "*** TEST STATE: BENCHMARK\n"
-#endif
-
 #undef printf
 #define printf(...) \
   do { \
@@ -61,27 +39,8 @@ extern "C" {
   do { \
   } while (0)
 
-#if defined(TEST_STATE_STRING)
-  #define TEST_BEGIN() \
-  do { \
-    rtems_printf( &rtems_test_printer, "\n"); \
-    rtems_printf( &rtems_test_printer, TEST_BEGIN_STRING ); \
-    rtems_printf( &rtems_test_printer, TEST_STATE_STRING ); \
-  } while (0)
-#else
-  #define TEST_BEGIN() \
-  do { \
-    rtems_printf( &rtems_test_printer, "\n" ); \
-    rtems_printf( &rtems_test_printer, TEST_BEGIN_STRING ); \
-  } while (0)
-#endif
-
-#define TEST_END() \
-  do { \
-     rtems_printf( &rtems_test_printer, "\n" ); \
-     rtems_printf( &rtems_test_printer, TEST_END_STRING ); \
-     rtems_printf( &rtems_test_printer, "\n" ); \
-  } while (0)
+#define TEST_BEGIN() rtems_test_begin(rtems_test_name, TEST_STATE)
+#define TEST_END()   rtems_test_end(rtems_test_name)
 
 #ifdef __cplusplus
 };
-- 
cgit v1.2.3