sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix typo error in testing/cxxtest.

Browse Source
This commit is contained in:
Xiang Xiao 2019-10-04 09:05:58 -06:00 committed by Gregory Nutt
parent e9cd27e8c3
commit c51b923b79
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/README.txt
View File

@ -27,8 +27,8 @@ testing/cxxtest
Example Configuration Options Example Configuration Options
----------------------------- -----------------------------
CONFIG_TESTINGCXXTEST=y - Eanbles the example CONFIG_TESTING_CXXTEST=y - Eanbles the example
CONFIG_TESTINGCXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX CONFIG_TESTING_CXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
and CONFIG_HAVE_CXXINITIALIZE are defined, then this example and CONFIG_HAVE_CXXINITIALIZE are defined, then this example
will call the NuttX function to initialize static C++ constructors. will call the NuttX function to initialize static C++ constructors.
This option may be disabled, however, if that static initialization This option may be disabled, however, if that static initialization

6
testing/cxxtest/Kconfig
View File

@ -3,16 +3,16 @@
# see the file kconfig-language.txt in the NuttX tools repository. # see the file kconfig-language.txt in the NuttX tools repository.
# #
config TESTINGCXXTEST config TESTING_CXXTEST
tristate "C++ test program" tristate "C++ test program"
default n default n
depends on HAVE_CXX depends on HAVE_CXX
---help--- ---help---
Enable the C++ test program Enable the C++ test program
if TESTINGCXXTEST if TESTING_CXXTEST
config TESTINGCXXTEST_CXXINITIALIZE config TESTING_CXXTEST_CXXINITIALIZE
bool "C++ Initialization" bool "C++ Initialization"
default y default y
depends on HAVE_CXX && HAVE_CXXINITIALIZE depends on HAVE_CXX && HAVE_CXXINITIALIZE

2
testing/cxxtest/Make.defs
View File

@ -34,6 +34,6 @@
# #
############################################################################ ############################################################################
ifneq ($(CONFIG_TESTINGCXXTEST),) ifneq ($(CONFIG_TESTING_CXXTEST),)
CONFIGURED_APPS += testing CONFIGURED_APPS += testing
endif endif

2
testing/cxxtest/Makefile
View File

@ -48,6 +48,6 @@ APPNAME = cxxtest
PRIORITY = SCHED_PRIORITY_DEFAULT PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 4096 STACKSIZE = 4096
MODULE = CONFIG_TESTINGCXXTEST MODULE = CONFIG_TESTING_CXXTEST
include $(APPDIR)/Application.mk include $(APPDIR)/Application.mk

4
testing/cxxtest/README.txt
View File

@ -15,8 +15,8 @@ README
Example Configuration Options Example Configuration Options
----------------------------- -----------------------------
CONFIG_TESTINGCXXTEST=y - Eanbles the example CONFIG_TESTING_CXXTEST=y - Eanbles the example
CONFIG_TESTINGCXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX CONFIG_TESTING_CXXTEST_CXXINITIALIZE=y - By default, if CONFIG_HAVE_CXX
and CONFIG_HAVE_CXXINITIALIZE are defined, then this example and CONFIG_HAVE_CXXINITIALIZE are defined, then this example
will call the NuttX function to initialize static C++ constructors. will call the NuttX function to initialize static C++ constructors.
This option may be disabled, however, if that static initialization This option may be disabled, however, if that static initialization

4
testing/cxxtest/cxxtest_main.cxx
View File

@ -61,7 +61,7 @@ using namespace std;
#if !defined(CONFIG_HAVE_CXX) || !defined(CONFIG_HAVE_CXXINITIALIZE) #if !defined(CONFIG_HAVE_CXX) || !defined(CONFIG_HAVE_CXXINITIALIZE)
# warning Support for static initializers is NOT enabled # warning Support for static initializers is NOT enabled
# undef CONFIG_TESTINGCXXTEST_CXXINITIALIZE # undef CONFIG_TESTING_CXXTEST_CXXINITIALIZE
#endif #endif
//*************************************************************************** //***************************************************************************
@ -250,7 +250,7 @@ extern "C"
// If C++ initialization for static constructors is supported, then do // If C++ initialization for static constructors is supported, then do
// that first // that first
#ifdef CONFIG_TESTINGCXXTEST_CXXINITIALIZE #ifdef CONFIG_TESTING_CXXTEST_CXXINITIALIZE
up_cxxinitialize(); up_cxxinitialize();
#endif #endif