fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 11:11:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5151 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-09-14 15:23:54 +00:00
parent cc0c42dd31
commit 857d2a770b
56 changed files with 311 additions and 487 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NxWidgets/UnitTests/CCheckBox/Makefile
+1 -1
View File
@@ -63,7 +63,7 @@ ARCHIVER=$(TESTTOOL_DIR)/addobjs.sh
ASRCS =
CSRCS =
CXXSRCS = main.cxx ccheckboxtest.cxx
CXXSRCS = ccheckbox_main.cxx ccheckboxtest.cxx
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
NxWidgets/UnitTests/CCheckBox/main.cxx → NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
+14 -14
View File
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// NxWidgets/UnitTests/CCheckBox/main.cxx
// NxWidgets/UnitTests/CCheckBox/ccheckbox_main.cxx
//
// Copyright (C) 2012 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <gnutt@nuttx.org>
@@ -73,7 +73,7 @@ static unsigned int g_mmprevious;
// Suppress name-mangling
extern "C" int MAIN_NAME(int argc, char *argv[]);
extern "C" int ccheckbox_main(int argc, char *argv[]);
/////////////////////////////////////////////////////////////////////////////
// Private Functions
@@ -135,7 +135,7 @@ static void initMemoryUsage(void)
// Name: user_start/nxheaders_main
/////////////////////////////////////////////////////////////////////////////
int MAIN_NAME(int argc, char *argv[])
int ccheckbox_main(int argc, char *argv[])
{
// Initialize memory monitor logic
@@ -143,31 +143,31 @@ int MAIN_NAME(int argc, char *argv[])
// Create an instance of the checkbox test
message(MAIN_STRING "Create CCheckBoxTest instance\n");
message("ccheckbox_main: Create CCheckBoxTest instance\n");
CCheckBoxTest *test = new CCheckBoxTest();
updateMemoryUsage(g_mmprevious, "After creating CCheckBoxTest");
// Connect the NX server
message(MAIN_STRING "Connect the CCheckBoxTest instance to the NX server\n");
message("ccheckbox_main: Connect the CCheckBoxTest instance to the NX server\n");
if (!test->connect())
{
message(MAIN_STRING "Failed to connect the CCheckBoxTest instance to the NX server\n");
message("ccheckbox_main: Failed to connect the CCheckBoxTest instance to the NX server\n");
delete test;
return 1;
}
updateMemoryUsage(g_mmprevious, MAIN_STRING "After connecting to the server");
updateMemoryUsage(g_mmprevious, "ccheckbox_main: After connecting to the server");
// Create a window to draw into
message(MAIN_STRING "Create a Window\n");
message("ccheckbox_main: Create a Window\n");
if (!test->createWindow())
{
message(MAIN_STRING "Failed to create a window\n");
message("ccheckbox_main: Failed to create a window\n");
delete test;
return 1;
}
updateMemoryUsage(g_mmprevious, MAIN_STRING "After creating a window");
updateMemoryUsage(g_mmprevious, "ccheckbox_main: After creating a window");
// Show the initial state of the checkbox
@@ -177,21 +177,21 @@ int MAIN_NAME(int argc, char *argv[])
// Now click the checkbox
message(MAIN_STRING "Click 1\n");
message("ccheckbox_main: Click 1\n");
test->clickCheckBox();
usleep(500*1000);
test->showCheckBoxState();
updateMemoryUsage(g_mmprevious, "After click 1");
usleep(500*1000);
message(MAIN_STRING "Click 2\n");
message("ccheckbox_main: Click 2\n");
test->clickCheckBox();
usleep(500*1000);
test->showCheckBoxState();
updateMemoryUsage(g_mmprevious, "After click 2");
usleep(500*1000);
message(MAIN_STRING "Click 3\n");
message("ccheckbox_main: Click 3\n");
test->clickCheckBox();
usleep(500*1000);
test->showCheckBoxState();
@@ -200,7 +200,7 @@ int MAIN_NAME(int argc, char *argv[])
// Clean up and exit
message(MAIN_STRING "Clean-up and exit\n");
message("ccheckbox_main: Clean-up and exit\n");
delete test;
updateMemoryUsage(g_mmprevious, "After deleting the test");
updateMemoryUsage(g_mmInitial, "Final memory usage");
NxWidgets/UnitTests/CCheckBox/ccheckboxtest.hxx
-10
View File
@@ -69,16 +69,6 @@
# define CONFIG_CCHECKBOXTEST_BGCOLOR CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR
#endif
// What is the entry point called?
#ifdef CONFIG_NSH_BUILTIN_APPS
# define MAIN_NAME ccheckbox_main
# define MAIN_STRING "ccheckbox_main: "
#else
# define MAIN_NAME user_start
# define MAIN_STRING "user_start: "
#endif
// If debug is enabled, use the debug function, lib_rawprintf() instead
// of printf() so that the output is synchronized.