From 096127ba7f47f21c821edca9bf12688d9946552e Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Thu, 18 Mar 2021 09:02:31 -0400 Subject: [PATCH 1/2] Fix #1223, shorten TestRunner function name --- docs/README_functionaltest.md | 2 +- modules/cfe_testrunner/inc/cfe_testrunner.h | 2 +- modules/cfe_testrunner/src/cfe_testrunner_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/README_functionaltest.md b/docs/README_functionaltest.md index 027e9f757..f4bfaaec6 100644 --- a/docs/README_functionaltest.md +++ b/docs/README_functionaltest.md @@ -30,7 +30,7 @@ To execute tests at startup, the following lines can be added to `cfe_es_startup 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_APP, /cf/cfe_testrunner.so, CFE_TR_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; diff --git a/modules/cfe_testrunner/inc/cfe_testrunner.h b/modules/cfe_testrunner/inc/cfe_testrunner.h index 8502714af..e55b3b27c 100644 --- a/modules/cfe_testrunner/inc/cfe_testrunner.h +++ b/modules/cfe_testrunner/inc/cfe_testrunner.h @@ -54,7 +54,7 @@ ** ** *************************************************************************/ -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 index c12153a23..eff1fb0e3 100644 --- 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; From 21f1b029f316a9c461f830bac40e0399a6da6a78 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Thu, 25 Mar 2021 11:02:40 -0400 Subject: [PATCH 2/2] Fix #1264, use simple filenames. --- docs/README_functionaltest.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/README_functionaltest.md b/docs/README_functionaltest.md index f4bfaaec6..b65a3f439 100644 --- 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_TR_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