From 0d89040ae3e91e6d05370033756ceee62660b0f4 Mon Sep 17 00:00:00 2001 From: Frederik Haxel Date: Thu, 1 Feb 2024 14:10:12 +0100 Subject: [PATCH] CI: Add native64 to CI - Test native64 like native in murdock - Add native64 to "Platform: native" in github labeler - Add "BUILDTEST_MCU_GROUP == x86_64" to `dist/tools/ci/build_and_test.sh` --- .github/labeler.yml | 2 ++ .murdock | 7 ++++--- dist/tools/ci/build_and_test.sh | 5 +++++ dist/tools/compile_test/compile_like_murdock.py | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 52ea3f48385d..bd1eb086acc1 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -118,7 +118,9 @@ "Platform: native": - "boards/native/**/*" + - "boards/native64/**/*" - "cpu/native/**/*" + - "makefiles/arch/native.inc.mk" "Platform: ARM": - "cpu/arm7_common/**/*" diff --git a/.murdock b/.murdock index a590cf1c3105..022f136aeba1 100755 --- a/.murdock +++ b/.murdock @@ -15,6 +15,7 @@ hifive1b msb-430 msba2 native +native64 nrf52840dk qn9080dk samr21-xpro @@ -38,7 +39,7 @@ esac # temporarily disabling llvm builds until https://github.com/RIOT-OS/RIOT/pull/15595 # is in -: ${TEST_BOARDS_LLVM_COMPILE:="iotlab-m3 native nrf52dk mulle nucleo-f401re samr21-xpro slstk3402a"} +: ${TEST_BOARDS_LLVM_COMPILE:="iotlab-m3 native native64 nrf52dk mulle nucleo-f401re samr21-xpro slstk3402a"} : ${TEST_WITH_CONFIG_SUPPORTED:="examples/suit_update tests/drivers/at86rf2xx_aes"} @@ -380,9 +381,9 @@ compile() { EMULATED=0 fi - if [ $RUN_TESTS -eq 1 -o "$board" = "native" -o "$EMULATED" = "1" ]; then + if [ $RUN_TESTS -eq 1 -o "$board" = "native" -o "$board" = "native64" -o "$EMULATED" = "1" ]; then if [ -f "${BINDIR}/.test" ]; then - if [ "$board" = "native" -o "${EMULATED}" = "1" ]; then + if [ "$board" = "native" -o "$board" = "native64" -o "${EMULATED}" = "1" ]; then # For native, we can run the test on the worker that also # compiled it (`make -C${appdir} test`). # "dwq-localjob" allows using some (locally run) command's diff --git a/dist/tools/ci/build_and_test.sh b/dist/tools/ci/build_and_test.sh index 730586368731..e8e8f170b50a 100755 --- a/dist/tools/ci/build_and_test.sh +++ b/dist/tools/ci/build_and_test.sh @@ -54,6 +54,11 @@ then set_result $? fi + if [ "$BUILDTEST_MCU_GROUP" == "x86_64" ] + then + make -C ./tests/unittests all test BOARD=native64 TERMPROG='gdb -batch -ex r -ex bt $(ELF)' || exit + set_result $? + fi ./dist/tools/compile_test/compile_test.py $BASE_BRANCH set_result $? diff --git a/dist/tools/compile_test/compile_like_murdock.py b/dist/tools/compile_test/compile_like_murdock.py index b8091d7dcf62..0823d43f889f 100755 --- a/dist/tools/compile_test/compile_like_murdock.py +++ b/dist/tools/compile_test/compile_like_murdock.py @@ -92,6 +92,7 @@ 'microbit', 'mulle', 'native', + 'native64', 'nrf52840dk', 'nrf9160dk', 'nucleo-f072rb',