From 1242936b47f7d7706e12a2ba097694924880d0cc Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Thu, 23 Sep 2021 11:12:15 -0400 Subject: [PATCH] Fix unit tests after native board fixup --- .../build/expected_all_platform_commands.txt | 48 +++++++++---------- scripts/build/test.py | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/build/expected_all_platform_commands.txt b/scripts/build/expected_all_platform_commands.txt index 36b97dc01fcbec..f69fe52bff18bc 100644 --- a/scripts/build/expected_all_platform_commands.txt +++ b/scripts/build/expected_all_platform_commands.txt @@ -1,26 +1,26 @@ -# Generating {real_platform}-native-all_clusters -gn gen --check --fail-on-unused-args --root={root}/examples/all-clusters-app/linux {out}/{real_platform}-native-all_clusters +# Generating {host_platform}-{host_board}-all_clusters +gn gen --check --fail-on-unused-args --root={root}/examples/all-clusters-app/linux {out}/{host_platform}-{host_board}-all_clusters -# Generating {real_platform}-native-chip_tool -gn gen --check --fail-on-unused-args --root={root}/examples/chip-tool {out}/{real_platform}-native-chip_tool +# Generating {host_platform}-{host_board}-chip_tool +gn gen --check --fail-on-unused-args --root={root}/examples/chip-tool {out}/{host_platform}-{host_board}-chip_tool -# Generating {real_platform}-native-thermostat -gn gen --check --fail-on-unused-args --root={root}/examples/thermostat/linux {out}/{real_platform}-native-thermostat +# Generating {host_platform}-{host_board}-thermostat +gn gen --check --fail-on-unused-args --root={root}/examples/thermostat/linux {out}/{host_platform}-{host_board}-thermostat -# Generating linux-arm64-arm64-all_clusters +# Generating linux-arm64-all_clusters bash -c ' PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ - gn gen --check --fail-on-unused-args --root={root}/examples/all-clusters-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-arm64-all_clusters' + gn gen --check --fail-on-unused-args --root={root}/examples/all-clusters-app/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-all_clusters' -# Generating linux-arm64-arm64-chip_tool +# Generating linux-arm64-chip_tool bash -c ' PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ - gn gen --check --fail-on-unused-args --root={root}/examples/chip-tool '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-arm64-chip_tool' + gn gen --check --fail-on-unused-args --root={root}/examples/chip-tool '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip_tool' -# Generating linux-arm64-arm64-thermostat +# Generating linux-arm64-thermostat bash -c ' PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ - gn gen --check --fail-on-unused-args --root={root}/examples/thermostat/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-arm64-thermostat' + gn gen --check --fail-on-unused-args --root={root}/examples/thermostat/linux '"'"'--args=target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-thermostat' # Generating qpg-qpg6100-lock gn gen --check --fail-on-unused-args --root={root}/examples/lock-app/qpg {out}/qpg-qpg6100-lock @@ -168,23 +168,23 @@ west build --cmake-only -d {out}/telink-tlsr9518adk80d-light -b tlsr9518adk80d { # Generating tizen-arm-light bash -c 'gn gen --check --fail-on-unused-args --root={root}/examples/lighting-app/linux '"'"'--args= target_os="tizen" target_cpu="arm" sysroot="TEST_TIZEN_HOME"'"'"' {out}/tizen-arm-light' -# Building {real_platform}-native-all_clusters -ninja -C {out}/{real_platform}-native-all_clusters +# Building {host_platform}-{host_board}-all_clusters +ninja -C {out}/{host_platform}-{host_board}-all_clusters -# Building {real_platform}-native-chip_tool -ninja -C {out}/{real_platform}-native-chip_tool +# Building {host_platform}-{host_board}-chip_tool +ninja -C {out}/{host_platform}-{host_board}-chip_tool -# Building {real_platform}-native-thermostat -ninja -C {out}/{real_platform}-native-thermostat +# Building {host_platform}-{host_board}-thermostat +ninja -C {out}/{host_platform}-{host_board}-thermostat -# Building linux-arm64-arm64-all_clusters -ninja -C {out}/linux-arm64-arm64-all_clusters +# Building linux-arm64-all_clusters +ninja -C {out}/linux-arm64-all_clusters -# Building linux-arm64-arm64-chip_tool -ninja -C {out}/linux-arm64-arm64-chip_tool +# Building linux-arm64-chip_tool +ninja -C {out}/linux-arm64-chip_tool -# Building linux-arm64-arm64-thermostat -ninja -C {out}/linux-arm64-arm64-thermostat +# Building linux-arm64-thermostat +ninja -C {out}/linux-arm64-thermostat # Building qpg-qpg6100-lock ninja -C {out}/qpg-qpg6100-lock diff --git a/scripts/build/test.py b/scripts/build/test.py index ad133a2aed8da8..ccf1deb63c88da 100644 --- a/scripts/build/test.py +++ b/scripts/build/test.py @@ -33,7 +33,7 @@ def build_expected_output(root: str, out: str) -> List[str]: with open(os.path.join(SCRIPT_ROOT, 'expected_all_platform_commands.txt'), 'rt') as f: for l in f.readlines(): - yield l.replace("{root}", root).replace("{out}", out).replace('{real_platform}', HostBoard.NATIVE.PlatformName()) + yield l.replace("{root}", root).replace("{out}", out).replace('{host_platform}', HostBoard.NATIVE.PlatformName()).replace('{host_board}', HostBoard.NATIVE.BoardName()) def build_actual_output(root: str, out: str) -> List[str]: