Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run cmake tests in CI #915

Merged
merged 2 commits into from
Aug 12, 2021
Merged

Run cmake tests in CI #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b0d1c9
Run cmake tests in CI
Joshua-Anderson Aug 12, 2021
470c680
Fix broken cmake tests
Joshua-Anderson Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 18 additions & 5 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
Framework:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
container:
image: nasafprime/fprime-base:latest

# Steps represent a sequence of tasks that will be executed as part of the job
Expand All @@ -38,7 +38,7 @@ jobs:
Ref:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
container:
image: nasafprime/fprime-base:latest

# Steps represent a sequence of tasks that will be executed as part of the job
Expand All @@ -60,7 +60,7 @@ jobs:
RPI:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
container:
image: nasafprime/fprime-base:latest

# Steps represent a sequence of tasks that will be executed as part of the job
Expand All @@ -82,7 +82,7 @@ jobs:
Integration:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
container:
image: nasafprime/fprime-base:latest

# Steps represent a sequence of tasks that will be executed as part of the job
Expand All @@ -99,4 +99,17 @@ jobs:
with:
name: ci-int-logs
path: ci-logs.tar.gz
retention-days: 5
retention-days: 5

CMake:
# The type of runner that the job will run on
runs-on: ubuntu-latest
container:
image: nasafprime/fprime-base:latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
# Runs CMake test cases
- name: CMake Tests
working-directory: ./cmake/test
run: pytest
6 changes: 5 additions & 1 deletion Drv/Ip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ set(SOURCE_FILES
"${CMAKE_CURRENT_LIST_DIR}/UdpSocket.cpp"
"${CMAKE_CURRENT_LIST_DIR}/SocketReadTask.cpp"
)
set(MOD_DEPS Os)

set(MOD_DEPS
Os
Fw/Buffer
)

register_fprime_module()

Expand Down
5 changes: 5 additions & 0 deletions Fw/Buffer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ set(SOURCE_FILES
"${CMAKE_CURRENT_LIST_DIR}/BufferSendPortAi.xml"
"${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp"
)

set(MOD_DEPS
Fw/Types
)

register_fprime_module()

set(UT_SOURCE_FILES
Expand Down
3 changes: 1 addition & 2 deletions Svc/Framer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ set(SOURCE_FILES
)

set(MOD_DEPS
Svc_FramingProtocol
Svc/FramingProtocol
)


register_fprime_module()

#### UTS ###
Expand Down
7 changes: 7 additions & 0 deletions Svc/FramingProtocol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@ set(SOURCE_FILES
"${CMAKE_CURRENT_LIST_DIR}/FprimeProtocol.cpp"
)

set(MOD_DEPS
Fw/Buffer
Fw/Time
Utils/Hash
Utils/Types
)

register_fprime_module()

2 changes: 1 addition & 1 deletion cmake/test/src/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
# Constants to supplied to the calls to subprocess
CMAKE = "cmake"
MAKE_CALL = "make"
MAKE_ARGS = ["-j128"]
MAKE_ARGS = ["-j2"]


def register_test(
Expand Down
55 changes: 53 additions & 2 deletions cmake/test/src/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
BUILD_DIR = os.path.join("<FPRIME>", "Ref")
EXPECTED = [
os.path.join("bin", platform.system(), "Ref"),
os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
os.path.join("lib", platform.system(), "libDrv_BlockDriver.a"),
os.path.join("lib", platform.system(), "libSvc_FileUplink.a"),
os.path.join("lib", platform.system(), "libSvc_CmdSequencer.a"),
Expand Down Expand Up @@ -52,7 +51,6 @@
os.path.join("lib", platform.system(), "libSvc_AssertFatalAdapter.a"),
os.path.join("lib", platform.system(), "libSvc_PolyIf.a"),
os.path.join("lib", platform.system(), "libSvc_FileDownlink.a"),
os.path.join("lib", platform.system(), "libFw_ComFile.a"),
os.path.join("lib", platform.system(), "libRef_RecvBuffApp.a"),
os.path.join("lib", platform.system(), "libSvc_Time.a"),
os.path.join("lib", platform.system(), "libFw_Cfg.a"),
Expand All @@ -63,5 +61,58 @@
os.path.join("lib", platform.system(), "libCFDP_Checksum.a"),
os.path.join("lib", platform.system(), "libSvc_PrmDb.a"),
os.path.join("lib", platform.system(), "libSvc_PassiveConsoleTextLogger.a"),
os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
os.path.join("<FPRIME_INSTALL>", "bin", "Ref"),
os.path.join("<FPRIME_INSTALL>", "dict", "RefTopologyAppDictionary.xml"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_BlockDriver.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileUplink.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdSequencer.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Time.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileManager.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SendBuffApp.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_FilePacket.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Ping.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Types.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libUtils_Hash.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Port.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_RateGroupDriver.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FatalHandler.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_TlmChan.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Obj.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Prm.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveRateGroup.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Cycle.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Health.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_LinuxTime.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_PingReceiver.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Com.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libDrv_DataTypes.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Buffer.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Comp.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_CmdDispatcher.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Log.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Tlm.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libOs.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_SignalGen.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Sched.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Seq.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_WatchDog.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_AssertFatalAdapter.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_FileDownlink.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libRef_RecvBuffApp.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Time.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cfg.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_Fatal.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_ActiveLogger.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_BufferManager.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libFw_Cmd.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libCFDP_Checksum.a"),
os.path.join("<FPRIME_INSTALL>", "lib", "static", "libSvc_PrmDb.a"),
os.path.join(
"<FPRIME_INSTALL>",
"lib",
"static",
"libSvc_PassiveConsoleTextLogger.a",
),
]
cmake.register_test(__name__, "ref-standard")
1 change: 0 additions & 1 deletion cmake/test/src/test_custom_target.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
os.path.join("awesome", "Svc_AssertFatalAdapter_is_awesome"),
os.path.join("awesome", "Svc_PolyIf_is_awesome"),
os.path.join("awesome", "Svc_FileDownlink_is_awesome"),
os.path.join("awesome", "Fw_ComFile_is_awesome"),
os.path.join("awesome", "Svc_Time_is_awesome"),
os.path.join("awesome", "Fw_Cfg_is_awesome"),
os.path.join("awesome", "Svc_Fatal_is_awesome"),
Expand Down
66 changes: 0 additions & 66 deletions cmake/test/src/test_install.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cmake/test/src/test_shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
os.path.join("lib", platform.system(), "libSvc_AssertFatalAdapter." + ext),
os.path.join("lib", platform.system(), "libSvc_PolyIf." + ext),
os.path.join("lib", platform.system(), "libSvc_FileDownlink." + ext),
os.path.join("lib", platform.system(), "libFw_ComFile." + ext),
os.path.join("lib", platform.system(), "libRef_RecvBuffApp." + ext),
os.path.join("lib", platform.system(), "libSvc_Time." + ext),
os.path.join("lib", platform.system(), "libFw_Cfg." + ext),
Expand Down
38 changes: 0 additions & 38 deletions cmake/test/src/test_ut.py
View file
Open in desktop

This file was deleted.