From 6d323f3c5ae9c108c45edd68a35a812612010201 Mon Sep 17 00:00:00 2001
From: Guillaume Endignoux <guillaumee@google.com>
Date: Thu, 5 Mar 2020 12:03:35 +0100
Subject: [PATCH] Apply make suggestions.
---
.github/workflows/boards_build.yml | 4 ++--
run_desktop_tests.sh | 10 ++--------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/boards_build.yml b/.github/workflows/boards_build.yml
index 477657f..61d1b5a 100644
--- a/.github/workflows/boards_build.yml
+++ b/.github/workflows/boards_build.yml
@@ -25,6 +25,6 @@ jobs:
run: ./setup.sh
- name: Building board nrf52840dk
- run: cd third_party/tock/boards/nordic/nrf52840dk && make
+ run: make -C third_party/tock/boards/nordic/nrf52840dk
- name: Building board nrf52840_dongle
- run: cd third_party/tock/boards/nordic/nrf52840_dongle && make
+ run: make -C third_party/tock/boards/nordic/nrf52840_dongle
diff --git a/run_desktop_tests.sh b/run_desktop_tests.sh
index 6e5a27d..33b2090 100755
--- a/run_desktop_tests.sh
+++ b/run_desktop_tests.sh
@@ -41,14 +41,8 @@ echo "Checking that CTAP2 builds and links properly (1 set of features)..."
cargo build --release --target=thumbv7em-none-eabi --features with_ctap1
echo "Checking that supported boards build properly..."
-cd third_party/tock/boards
-cd nordic/nrf52840dk
-make
-cd ../..
-cd nordic/nrf52840_dongle
-make
-cd ../..
-cd ../../..
+make -C third_party/tock/boards/nordic/nrf52840dk
+make -C third_party/tock/boards/nordic/nrf52840_dongle
if [ -z "${TRAVIS_OS_NAME}" -o "${TRAVIS_OS_NAME}" = "linux" ]
then
--
GitLab