btach/MarlinFirmware
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

🧑‍💻 Allow for tests on macOS / Windows

Browse source
This commit is contained in:
Scott Lahteine 2025-03-27 20:55:59 -05:00
parent 448ff71899
commit efa175820f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -17,7 +17,7 @@ help:
@echo "make tests-all-local-docker : Run all tests locally, using docker" @echo "make tests-all-local-docker : Run all tests locally, using docker"
@echo "make unit-test-single-local : Run unit tests for a single config locally" @echo "make unit-test-single-local : Run unit tests for a single config locally"
@echo "make unit-test-single-local-docker : Run unit tests for a single config locally, using docker" @echo "make unit-test-single-local-docker : Run unit tests for a single config locally, using docker"
@echo "make unit-test-all-local : Run all code tests locally" @echo "make unit-test-all-local : Run all code tests locally"
@echo "make unit-test-all-local-docker : Run all code tests locally, using docker" @echo "make unit-test-all-local-docker : Run all code tests locally, using docker"
@echo "make setup-local-docker : Setup local docker using buildx" @echo "make setup-local-docker : Setup local docker using buildx"
@echo "" @echo ""

2
Marlin/src/pins/pins.h
View file

@ -985,7 +985,7 @@
// //
#elif MB(SIMULATED) #elif MB(SIMULATED)
#include "native/pins_RAMPS_NATIVE.h" // Native or Simulation lin:linux_native mac:simulator_macos_debug mac:simulator_macos_release win:simulator_windows lin:simulator_linux_debug lin:simulator_linux_release #include "native/pins_RAMPS_NATIVE.h" // Native or Simulation lin:linux_native lin:simulator_linux_debug lin:simulator_linux_release lin:linux_native_test mac:simulator_macos_debug mac:simulator_macos_release win:simulator_windows
#else #else

6
buildroot/share/PlatformIO/scripts/collect-code-tests.py
View file

@ -1,6 +1,6 @@
# #
# collect-code-tests.py # collect-code-tests.py
# Convenience script to collect all code tests. Used by env:linux_native_test in native.ini. # Convenience script to collect all code tests. Used by test envs in native.ini.
# #
import pioutil import pioutil
@ -32,7 +32,7 @@ if pioutil.is_pio_build():
"restore_configs", "restore_configs",
f"cp -f {path} ./Marlin/config.ini", f"cp -f {path} ./Marlin/config.ini",
"python ./buildroot/share/PlatformIO/scripts/configuration.py", "python ./buildroot/share/PlatformIO/scripts/configuration.py",
f"platformio test -e linux_native_test -f {name}", f"platformio test -e {env['PIOENV']} -f {name}",
"restore_configs", "restore_configs",
], ],
title = "Marlin: {}".format(name.lower().title().replace("_", " ")), title = "Marlin: {}".format(name.lower().title().replace("_", " ")),
@ -46,7 +46,7 @@ if pioutil.is_pio_build():
name = "test-marlin", name = "test-marlin",
dependencies = None, dependencies = None,
actions = [ actions = [
f"platformio run -t marlin_{name} -e linux_native_test" f"platformio run -t marlin_{name} -e {env['PIOENV']}"
for name in targets for name in targets
], ],
title = "Marlin: Test all code test suites", title = "Marlin: Test all code test suites",

2
buildroot/share/PlatformIO/scripts/preflight-checks.py
View file

@ -95,7 +95,7 @@ if pioutil.is_pio_build():
# Make sure board is compatible with the build environment. Skip for _test, # Make sure board is compatible with the build environment. Skip for _test,
# since the board is manipulated as each unit test is executed. # since the board is manipulated as each unit test is executed.
if not result and build_env != "linux_native_test": if not result and not build_env.endswith("_native_test"):
err = "Error: Build environment '%s' is incompatible with %s. Use one of these environments: %s" % \ err = "Error: Build environment '%s' is incompatible with %s. Use one of these environments: %s" % \
( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) ) ( build_env, motherboard, ", ".join([ e[4:] for e in board_envs if e.startswith("env:") ]) )
raise SystemExit(err) raise SystemExit(err)