From 838c3db46c9a4afd52b31ec046189b4817b1c746 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Fri, 18 Jun 2021 08:52:10 +0200 Subject: [PATCH] Update the path of chip-all-clusters-app into scripts/tests/test_suites.sh so it can either be runned from CI or from a build from ./gn_build.sh (#7638) --- .github/workflows/tests.yaml | 4 ++-- scripts/tests/test_suites.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 6b88bdb5d40fd2..08c5d30f3beaeb 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -61,7 +61,7 @@ jobs: - name: Build all clusters app timeout-minutes: 5 run: | - scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false + scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/standalone/ chip_config_network_layer_ble=false - name: Build chip-tool timeout-minutes: 5 run: | @@ -134,7 +134,7 @@ jobs: - name: Run Build Test Server timeout-minutes: 5 run: | - scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false + scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/standalone/ chip_config_network_layer_ble=false - name: Build chip-tool timeout-minutes: 5 run: | diff --git a/scripts/tests/test_suites.sh b/scripts/tests/test_suites.sh index 96951161f10aa2..35a7ed082765ce 100755 --- a/scripts/tests/test_suites.sh +++ b/scripts/tests/test_suites.sh @@ -75,7 +75,7 @@ for j in "${iter_array[@]}"; do rm -rf /tmp/all-clusters-log rm -rf /tmp/pid ( - stdbuf -o0 out/debug/chip-all-clusters-app & + stdbuf -o0 out/debug/standalone/chip-all-clusters-app & echo $! >&3 ) 3>/tmp/pid | tee /tmp/all-clusters-log & while ! grep -q "Server Listening" /tmp/all-clusters-log; do