Skip to content

Commit 2d03f99

Browse files
Kronos3Kronos3
authored
Merge branch 'devel' into compile-time-assert
2 parents d455aab + ebd2306 commit 2d03f99

4 files changed

Lines changed: 43 additions & 31 deletions

File tree

‎Svc/FileWorker/CMakeLists.txt‎

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
#
1111
####
1212

13-
if (BUILD_TESTING AND NOT __FPRIME_NO_UT_GEN__)
14-
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test/FileTester")
15-
endif()
1613

1714
register_fprime_module(
1815
AUTOCODER_INPUTS
@@ -39,18 +36,31 @@ register_fprime_ut(
3936
"${CMAKE_CURRENT_LIST_DIR}"
4037
)
4138

42-
register_fprime_ut(
43-
FileWorkerTestError
44-
AUTOCODER_INPUTS
45-
"${CMAKE_CURRENT_LIST_DIR}/FileWorker.fpp"
46-
SOURCES
47-
"${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTestMain.cpp"
48-
"${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTester.cpp"
49-
CHOOSES_IMPLEMENTATIONS
50-
Svc_FileWorker_test_FileTester
51-
DEPENDS
52-
STest
53-
UT_AUTO_HELPERS
54-
WORKING_DIRECTORY
55-
"${CMAKE_CURRENT_LIST_DIR}"
56-
)
39+
# FileTester is a test dependency and only supported on Posix platforms, therefore:
40+
# - only attempt to add the FileTester module in BUILD_TESTING
41+
# - only add the FileWorkerTestError test if the FileTester module was successfully added
42+
if (BUILD_TESTING AND NOT __FPRIME_NO_UT_GEN__)
43+
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/test/FileTester")
44+
45+
# Target will not exist on non-Posix platforms, so guard against its existence
46+
if (TARGET Svc_FileWorker_test_FileTester)
47+
register_fprime_ut(
48+
FileWorkerTestError
49+
AUTOCODER_INPUTS
50+
"${CMAKE_CURRENT_LIST_DIR}/FileWorker.fpp"
51+
SOURCES
52+
"${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTestMain.cpp"
53+
"${CMAKE_CURRENT_LIST_DIR}/test/ut/FileWorkerErrTester.cpp"
54+
CHOOSES_IMPLEMENTATIONS
55+
Svc_FileWorker_test_FileTester
56+
DEPENDS
57+
STest
58+
UT_AUTO_HELPERS
59+
WORKING_DIRECTORY
60+
"${CMAKE_CURRENT_LIST_DIR}"
61+
)
62+
else()
63+
# Only print message if we're in BUILD_TESTING *and* FileTester isn't available
64+
message(STATUS "Svc/FileWorker: FileTester test dependency is only supported on Posix, skipping FileWorkerTestError")
65+
endif()
66+
endif()

‎Svc/FileWorker/test/FileTester/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
restrict_platforms(Posix)
2+
13
register_fprime_implementation(
24
Svc_FileWorker_test_FileTester
35
IMPLEMENTS

‎docs/user-manual/framework/supported-platforms.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Supported Platforms
22

3-
| Hardware | OS | Architecture | Reference Project |
4-
| ---------------- | -------------------- | -------------- | ---------------------------------- |
5-
| Apple Silicon | Darwin | ARM | [`F Prime Ref`](https://github.com/nasa/fprime) |
6-
| BeagleBone Black | VxWorks 7 | ARMv7 | [`fprime-vxworks-reference`](https://github.com/fprime-community/fprime-vxworks-reference) |
7-
| Feather M4 | FreeRTOS | ARM | [`fprime-featherm4-freertos-reference`](https://github.com/fprime-community/fprime-featherm4-freertos-reference) |
8-
| Pi Pico | Zephyr | ARMv6-M | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) |
9-
| Pi Pico 2 | Zephyr | RISC-V | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) |
10-
| PolarFire SoC | VxWorks 7 | RISC-V | TBD |
11-
| PyCubed | Zephyr | RISC-V | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) |
12-
| Raspberry Pi | Linux | ARMv8 | [`fprime-workshop-led-blinker`](https://github.com/fprime-community/fprime-workshop-led-blinker) |
13-
| Teensy41 | Zephyr | ARMv7-M | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) |
14-
| x86 | Linux | x86\_64 | [`F Prime Ref`](https://github.com/nasa/fprime) |
3+
| Hardware | OS | Architecture | Reference Project | Build Status |
4+
| ---------------- | -------------------- | ------------------------------- | ---------------------------------- | ------------ |
5+
| Apple Silicon | Darwin | ARM | [`F Prime Ref`](https://github.com/nasa/fprime) | [![CI [macOS]](https://github.com/nasa/fprime/actions/workflows/build-test-macos.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/build-test-macos.yml) |
6+
| BeagleBone Black | VxWorks 7 | ARMv7 | [`fprime-vxworks-reference`](https://github.com/fprime-community/fprime-vxworks-reference) | N/A |
7+
| Feather M4 | FreeRTOS | ARM | [`fprime-featherm4-freertos-reference`](https://github.com/fprime-community/fprime-featherm4-freertos-reference) | N/A |
8+
| Pi Pico | Zephyr | ARMv6-M | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) | N/A |
9+
| Pi Pico 2 | Zephyr | RISC-V | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) | [![External Repo: Zephyr Reference (Pico 2)](https://github.com/nasa/fprime/actions/workflows/ext-fprime-zephyr-reference-pico2.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/ext-fprime-zephyr-reference-pico2.yml) |
10+
| PolarFire SoC | VxWorks 7 | RISC-V | TBD | N/A |
11+
| PyCubed | Zephyr | RISC-V | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) | N/A |
12+
| Raspberry Pi | Linux | ARMv8 | [`fprime-workshop-led-blinker`](https://github.com/fprime-community/fprime-workshop-led-blinker) | [![External Repo: RPI LedBlinker](https://github.com/nasa/fprime/actions/workflows/ext-raspberry-led-blinker.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/ext-raspberry-led-blinker.yml) |
13+
| Teensy41 | Zephyr | ARMv7-M | [`fprime-zephyr-reference`](https://github.com/fprime-community/fprime-zephyr-reference) | [![External Repo: Zephyr Reference (Teensy 4.1)](https://github.com/nasa/fprime/actions/workflows/ext-fprime-zephyr-reference-teensy41.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/ext-fprime-zephyr-reference-teensy41.yml) |
14+
| x86 | Linux | x86\_64 | [`F Prime Ref`](https://github.com/nasa/fprime) | [![CI [ubuntu]](https://github.com/nasa/fprime/actions/workflows/build-test.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/build-test.yml) [![CI [RHEL8]](https://github.com/nasa/fprime/actions/workflows/build-test-rhel8.yml/badge.svg)](https://github.com/nasa/fprime/actions/workflows/build-test-rhel8.yml) |
1515

1616
## Targeted Platforms (Planned Support)
1717

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ iniconfig==2.0.0
3030
itsdangerous==2.2.0
3131
Jinja2==3.1.6
3232
legacy-cgi==2.6.1; python_version >= "3.13"
33-
lxml==6.0.2
33+
lxml==6.1.0
3434
Markdown==3.8.1
3535
markdown-it-py==3.0.0
3636
MarkupSafe==3.0.3

0 commit comments

Comments
 (0)