Update all unit tests to conform to recent naming convention changes in NuttX

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5151 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 11 insertions, 21 deletions

diff --git a/NxWidgets/UnitTests/CTextBox/Makefile b/NxWidgets/UnitTests/CTextBox/Makefile
index bd7d98491..c368cc497 100644
--- a/NxWidgets/UnitTests/CTextBox/Makefile
+++ b/NxWidgets/UnitTests/CTextBox/Makefile
@@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
 
 ASRCS		=
 CSRCS		=
-CXXSRCS		= main.cxx ctextboxtest.cxx
+CXXSRCS		= ctextbox_main.cxx ctextboxtest.cxx
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/NxWidgets/UnitTests/CTextBox/main.cxx b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
index b5b8ec4d5..da76c88cf 100644
--- a/NxWidgets/UnitTests/CTextBox/main.cxx
+++ b/NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// NxWidgets/UnitTests/CTextBox/main.cxx
+// NxWidgets/UnitTests/CTextBox/ctextbox_main.cxx
 //
 //   Copyright (C) 2012 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -69,7 +69,7 @@ static const char string2[] = "\b\b\bn Doe\r";
 
 // Suppress name-mangling
 
-extern "C" int MAIN_NAME(int argc, char *argv[]);
+extern "C" int ctextbox_main(int argc, char *argv[]);
 
 /////////////////////////////////////////////////////////////////////////////
 // Public Functions
@@ -79,29 +79,29 @@ extern "C" int MAIN_NAME(int argc, char *argv[]);
 // user_start/nxheaders_main
 /////////////////////////////////////////////////////////////////////////////
 
-int MAIN_NAME(int argc, char *argv[])
+int ctextbox_main(int argc, char *argv[])
 {
   // Create an instance of the font test
 
-  printf(MAIN_STRING "Create CTextBoxTest instance\n");
+  printf("ctextbox_main: Create CTextBoxTest instance\n");
   CTextBoxTest *test = new CTextBoxTest();
 
   // Connect the NX server
 
-  printf(MAIN_STRING "Connect the CTextBoxTest instance to the NX server\n");
+  printf("ctextbox_main: Connect the CTextBoxTest instance to the NX server\n");
   if (!test->connect())
     {
-      printf(MAIN_STRING "Failed to connect the CTextBoxTest instance to the NX server\n");
+      printf("ctextbox_main: Failed to connect the CTextBoxTest instance to the NX server\n");
       delete test;
       return 1;
     }
 
   // Create a window to draw into
 
-  printf(MAIN_STRING "Create a Window\n");
+  printf("ctextbox_main: Create a Window\n");
   if (!test->createWindow())
     {
-      printf(MAIN_STRING "Failed to create a window\n");
+      printf("ctextbox_main: Failed to create a window\n");
       delete test;
       return 1;
     }
@@ -111,7 +111,7 @@ int MAIN_NAME(int argc, char *argv[])
   CTextBox *textbox = test->createTextBox();
   if (!textbox)
     {
-      printf(MAIN_STRING "Failed to create a text box\n");
+      printf("ctextbox_main: Failed to create a text box\n");
       delete test;
       return 1;
     }
@@ -133,7 +133,7 @@ int MAIN_NAME(int argc, char *argv[])
   // Clean up and exit
 
   sleep(2);
-  printf(MAIN_STRING "Clean-up and exit\n");
+  printf("ctextbox_main: Clean-up and exit\n");
   delete textbox;
   delete test;
   return 0;
diff --git a/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx b/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
index 1d470a1a8..9da8ce09f 100644
--- a/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
+++ b/NxWidgets/UnitTests/CTextBox/ctextboxtest.hxx
@@ -75,16 +75,6 @@
 #  define CONFIG_CTEXTBOXTEST_FONTCOLOR CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR
 #endif
 
-// What is the entry point called?
-
-#ifdef CONFIG_NSH_BUILTIN_APPS
-#  define MAIN_NAME ctextbox_main
-#  define MAIN_STRING "ctextbox_main: "
-#else
-#  define MAIN_NAME user_start
-#  define MAIN_STRING "user_start: "
-#endif
-
 /////////////////////////////////////////////////////////////////////////////
 // Public Classes
 /////////////////////////////////////////////////////////////////////////////