Skip to content

Commit

Permalink
Merge pull request #1800 from pepepr08/fix812-perf-ft
Browse files Browse the repository at this point in the history
Fix #812, Add Perf API functional tests
  • Loading branch information
astrogeco authored Aug 16, 2021
2 parents 2a4d938 + 6887fbf commit 9da565a
Show file tree
Hide file tree
Showing 5 changed files with 81 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,14 @@ jobs:
- name: List cpu1
run: ls build/exe/cpu1/

# Run cFS, send commands to set perf trigger and start perf data, and run functional tests
- name: Run cFS
run: |
./core-cpu1 &
sleep 10
../host/cmdUtil --pktid=0x1806 --cmdcode=4 --endian=LE --string="20:CFE_TEST_APP" --string="20:CFE_TestMain" --string="64:cfe_testcase" --uint32=16384 --uint8=0 --uint8=0 --uint16=100 &
../host/cmdUtil --pktid=0x1806 --cmdcode=17 --endian=LE --uint32=3 --uint32=0x40000000
../host/cmdUtil --pktid=0x1806 --cmdcode=14 --endian=LE --uint32=2
../host/cmdUtil --pktid=0x1806 --cmdcode=4 --endian=LE --string="20:CFE_TEST_APP" --string="20:CFE_TestMain" --string="64:cfe_testcase" --uint32=16384 --uint8=0 --uint8=0 --uint16=100
sleep 30
counter=0
Expand Down
1 change: 1 addition & 0 deletions modules/cfe_testcase/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ add_cfe_app(cfe_testcase
src/es_counter_test.c
src/es_misc_test.c
src/es_mempool_test.c
src/es_perf_test.c
src/es_resource_id_test.c
src/evs_filters_test.c
src/evs_send_test.c
Expand Down
1 change: 1 addition & 0 deletions modules/cfe_testcase/src/cfe_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ void CFE_TestMain(void)
ESInfoTestSetup();
ESMemPoolTestSetup();
ESMiscTestSetup();
ESPerfTestSetup();
ESResourceIDTestSetup();
ESTaskTestSetup();
EVSFiltersTestSetup();
Expand Down
1 change: 1 addition & 0 deletions modules/cfe_testcase/src/cfe_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ void ESCounterTestSetup(void);
void ESInfoTestSetup(void);
void ESMemPoolTestSetup(void);
void ESMiscTestSetup(void);
void ESPerfTestSetup(void);
void ESResourceIDTestSetup(void);
void ESTaskTestSetup(void);
void EVSFiltersTestSetup(void);
Expand Down
74 changes: 74 additions & 0 deletions modules/cfe_testcase/src/es_perf_test.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*************************************************************************
**
** GSC-18128-1, "Core Flight Executive Version 6.7"
**
** Copyright (c) 2006-2019 United States Government as represented by
** the Administrator of the National Aeronautics and Space Administration.
** All Rights Reserved.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
**
** File: es_perf_test.c
**
** Purpose:
** Functional test of ES Performance APIs
**
*************************************************************************/

/*
* Includes
*/

#include "cfe_test.h"

void TestPerfLogEntry(void)
{
UtAssert_VOIDCALL(CFE_ES_PerfLogEntry(0));
UtAssert_VOIDCALL(CFE_ES_PerfLogEntry(CFE_MISSION_ES_PERF_MAX_IDS - 1));
UtAssert_VOIDCALL(CFE_ES_PerfLogEntry(CFE_MISSION_ES_PERF_MAX_IDS));
}

void TestPerfLogExit(void)
{
UtAssert_VOIDCALL(CFE_ES_PerfLogExit(0));
UtAssert_VOIDCALL(CFE_ES_PerfLogExit(CFE_MISSION_ES_PERF_MAX_IDS - 1));
UtAssert_VOIDCALL(CFE_ES_PerfLogExit(CFE_MISSION_ES_PERF_MAX_IDS));
}

void TestPerfLogAdd(void)
{
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(0, 0));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(0, 1));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(0, 0xFFFFFFFF));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 0));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 1));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS - 1, 0xFFFFFFFF));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 0));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 1));
UtAssert_VOIDCALL(CFE_ES_PerfLogAdd(CFE_MISSION_ES_PERF_MAX_IDS, 0xFFFFFFFF));
}

/* These commands should trigger and stop perf data (based on value commanded in functional test workflow) */
void TestPerfLogTrigger(void)
{
UtAssert_VOIDCALL(CFE_ES_PerfLogEntry(126));
UtAssert_VOIDCALL(CFE_ES_PerfLogExit(126));
}

void ESPerfTestSetup(void)
{
UtTest_Add(TestPerfLogEntry, NULL, NULL, "Test PerfLogEntry");
UtTest_Add(TestPerfLogExit, NULL, NULL, "Test PerfLogExit");
UtTest_Add(TestPerfLogAdd, NULL, NULL, "Test PerfLogAdd");
UtTest_Add(TestPerfLogTrigger, NULL, NULL, "Test Perf Trigger");
}

0 comments on commit 9da565a

Please sign in to comment.