Merge pull request #1242 from zanzaben/fix1223_Testrunner_name_too_long

Fix #1223, #1264 shorten TestRunner function name and update cfe_es_startup.scr docs
nasa · Mar 29, 2021 · b46d164 · b46d164
2 parents 66e2463 + 21f1b02
commit b46d164
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docs/README_functionaltest.md b/docs/README_functionaltest.md
@@ -29,10 +29,10 @@ cases.  It also must be loaded after `cfe_assert`.
 To execute tests at startup, the following lines can be added to `cfe_es_startup.scr` on the
 designated test target:
 
-    CFE_LIB, /cf/cfe_assert.so,     CFE_Assert_LibInit,     ASSERT_LIB,  0,     0,      0x0, 0;
-    CFE_APP, /cf/cfe_testrunner.so, CFE_TestRunner_AppMain, TESTRUN_APP, 100,   16384,  0x0, 0;
-    CFE_LIB, /cf/cfe_testcase.so,   CFE_Test_Init,          CFETEST_LIB, 0,     0,      0x0, 0;
-    CFE_LIB, /cf/psp_test.so,       PSP_Test_Init,          PSPTEST_LIB, 0,     0,      0x0, 0;
+    CFE_LIB, cfe_assert,     CFE_Assert_LibInit, ASSERT_LIB,  0,     0,      0x0, 0;
+    CFE_APP, cfe_testrunner, CFE_TR_AppMain,     TESTRUN_APP, 100,   16384,  0x0, 0;
+    CFE_LIB, cfe_testcase,   CFE_Test_Init,      CFETEST_LIB, 0,     0,      0x0, 0;
+    CFE_LIB, psp_test,       PSP_Test_Init,      PSPTEST_LIB, 0,     0,      0x0, 0;
 
 It is important that `cfe_assert` is loaded first, as all other test libraries depend on
 symbols provided in this library.  The order of loading other test cases should not

diff --git a/modules/cfe_testrunner/inc/cfe_testrunner.h b/modules/cfe_testrunner/inc/cfe_testrunner.h
@@ -60,6 +60,6 @@
 **  \return Execution status, see \ref CFEReturnCodes
 **
 *************************************************************************/
-void CFE_TestRunner_AppMain(void);
+void CFE_TR_AppMain(void);
 
 #endif /* CFE_TESTRUNNER_H */
diff --git a/modules/cfe_testrunner/src/cfe_testrunner_main.c b/modules/cfe_testrunner/src/cfe_testrunner_main.c
@@ -59,7 +59,7 @@
 /*
  * Entry point for this application
  */
-void CFE_TestRunner_AppMain(void)
+void CFE_TR_AppMain(void)
 {
     int32  rc;
     uint32 RunStatus;