From 18d0a49129e8e70ba2c2bf169f91c92e93dabd84 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 5 Mar 2015 08:44:59 +0100 Subject: Move test support from sapi to libmisc/testsupport --- cpukit/sapi/Makefile.am | 3 - cpukit/sapi/include/rtems/test.h | 125 --------------------------------------- cpukit/sapi/preinstall.am | 4 -- cpukit/sapi/src/testbeginend.c | 43 -------------- cpukit/sapi/src/testextension.c | 72 ---------------------- 5 files changed, 247 deletions(-) delete mode 100644 cpukit/sapi/include/rtems/test.h delete mode 100644 cpukit/sapi/src/testbeginend.c delete mode 100644 cpukit/sapi/src/testextension.c (limited to 'cpukit/sapi') diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index a7eaad5bbe..070800e636 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -19,7 +19,6 @@ include_rtems_HEADERS += include/rtems/rbheap.h include_rtems_HEADERS += include/rtems/rbtree.h include_rtems_HEADERS += include/rtems/scheduler.h include_rtems_HEADERS += include/rtems/sptables.h -include_rtems_HEADERS += include/rtems/test.h include_rtems_HEADERS += include/rtems/timespec.h EXTRA_DIST = include/rtems/README @@ -40,8 +39,6 @@ libsapi_a_SOURCES += src/delayticks.c libsapi_a_SOURCES += src/delaynano.c libsapi_a_SOURCES += src/profilingiterate.c libsapi_a_SOURCES += src/profilingreportxml.c -libsapi_a_SOURCES += src/testbeginend.c -libsapi_a_SOURCES += src/testextension.c libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) include $(srcdir)/preinstall.am diff --git a/cpukit/sapi/include/rtems/test.h b/cpukit/sapi/include/rtems/test.h deleted file mode 100644 index 48a33a04e5..0000000000 --- a/cpukit/sapi/include/rtems/test.h +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2014 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef _RTEMS_TEST_H -#define _RTEMS_TEST_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * @defgroup RTEMSTest Test Support - * - * @brief Test support functions. - * - * @{ - */ - -/** - * @brief Each test must define a test name string. - */ -extern const char rtems_test_name[]; - -/** - * @brief Fatal extension for tests. - */ -void rtems_test_fatal_extension( - rtems_fatal_source source, - bool is_internal, - rtems_fatal_code code -); - -/** - * @brief Initial extension for tests. - */ -#define RTEMS_TEST_INITIAL_EXTENSION \ - { NULL, NULL, NULL, NULL, NULL, NULL, NULL, rtems_test_fatal_extension } - -/** - * @brief Prints a begin of test message. - * - * @param[in] printf_func The formatted output function. - * @param[in, out] printf_arg The formatted output function argument. - * - * @returns As specified by printf(). - */ -int rtems_test_begin_with_plugin( - rtems_printk_plugin_t printf_func, - void *printf_arg -); - -/** - * @brief Prints a begin of test message using printf(). - * - * @returns As specified by printf(). - */ -static inline int rtems_test_begin(void) -{ - return rtems_test_begin_with_plugin(rtems_printf_plugin, NULL); -} - -/** - * @brief Prints a begin of test message using printk(). - * - * @returns As specified by printf(). - */ -static inline int rtems_test_begink(void) -{ - return rtems_test_begin_with_plugin(printk_plugin, NULL); -} - -/** - * @brief Prints an end of test message. - * - * @param[in] printf_func The formatted output function. - * @param[in, out] printf_arg The formatted output function argument. - * - * @returns As specified by printf(). - */ -int rtems_test_end_with_plugin( - rtems_printk_plugin_t printf_func, - void *printf_arg -); - -/** - * @brief Prints an end of test message using printf(). - * - * @returns As specified by printf(). - */ -static inline int rtems_test_end(void) -{ - return rtems_test_end_with_plugin(rtems_printf_plugin, NULL); -} - -/** - * @brief Prints an end of test message using printk(). - * - * @returns As specified by printf(). - */ -static inline int rtems_test_endk(void) -{ - return rtems_test_end_with_plugin(printk_plugin, NULL); -} - -/** @} */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _RTEMS_TEST_H */ diff --git a/cpukit/sapi/preinstall.am b/cpukit/sapi/preinstall.am index f8593f4f3d..3f864bb61d 100644 --- a/cpukit/sapi/preinstall.am +++ b/cpukit/sapi/preinstall.am @@ -82,10 +82,6 @@ $(PROJECT_INCLUDE)/rtems/sptables.h: include/rtems/sptables.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/sptables.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/sptables.h -$(PROJECT_INCLUDE)/rtems/test.h: include/rtems/test.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/test.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/test.h - $(PROJECT_INCLUDE)/rtems/timespec.h: include/rtems/timespec.h $(PROJECT_INCLUDE)/rtems/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/timespec.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/timespec.h diff --git a/cpukit/sapi/src/testbeginend.c b/cpukit/sapi/src/testbeginend.c deleted file mode 100644 index 6383b33a78..0000000000 --- a/cpukit/sapi/src/testbeginend.c +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2014 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - -#include - -int rtems_test_begin_with_plugin( - rtems_printk_plugin_t printf_func, - void *printf_arg -) -{ - return (*printf_func)( - printf_arg, - "\n\n*** BEGIN OF TEST %s ***\n", - rtems_test_name - ); -} - -int rtems_test_end_with_plugin( - rtems_printk_plugin_t printf_func, - void *printf_arg -) -{ - return (*printf_func)( - printf_arg, - "*** END OF TEST %s ***\n", - rtems_test_name - ); -} diff --git a/cpukit/sapi/src/testextension.c b/cpukit/sapi/src/testextension.c deleted file mode 100644 index f59ae0d3ee..0000000000 --- a/cpukit/sapi/src/testextension.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2014 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifdef HAVE_CONFIG_H - #include "config.h" -#endif - -#include -#include - -#if defined(RTEMS_PROFILING) -static bool report_done; - -static rtems_interrupt_lock report_lock = - RTEMS_INTERRUPT_LOCK_INITIALIZER( "test report" ); -#endif - -void rtems_test_fatal_extension( - rtems_fatal_source source, - bool is_internal, - rtems_fatal_code code -) -{ -#if defined(RTEMS_PROFILING) - rtems_interrupt_lock_context lock_context; - - /* - * Ensures to report only once on SMP machines and ensures that the report is - * output completely. - */ - rtems_interrupt_lock_acquire( &report_lock, &lock_context ); - - if ( !report_done ) { - report_done = true; - - printk( - "\n*** PROFILING REPORT BEGIN %s ***\n", - rtems_test_name - ); - - rtems_profiling_report_xml( - rtems_test_name, - printk_plugin, - NULL, - 1, - " " - ); - - printk( - "*** PROFILING REPORT END %s ***\n", - rtems_test_name - ); - } - - rtems_interrupt_lock_release( &report_lock, &lock_context ); -#endif - - (void) source; - (void) is_internal; - (void) code; -} -- cgit v1.2.3