From 2347161c14e09223753f3429cda731d24fa7bfe8 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 28 Jun 2022 23:11:05 -0400 Subject: [PATCH] =?UTF-8?q?Add=20fake=20platform=20argument=20to=20running?= =?UTF-8?q?=20fake=20tests,=20exclude=20TestFailsaf=E2=80=A6=20(#20091)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add fake platform argument to running fake tests, exclude TestFailsafeContext from fake platform (no timer impl) * Restyle --- scripts/build/builders/host.py | 1 + scripts/build/testdata/build_linux_on_x64.txt | 2 +- src/app/tests/BUILD.gn | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/build/builders/host.py b/scripts/build/builders/host.py index 161f9d35870ce5..765e9bcb17e1d3 100644 --- a/scripts/build/builders/host.py +++ b/scripts/build/builders/host.py @@ -285,6 +285,7 @@ def GnBuildArgs(self): 'custom_toolchain="//build/toolchain/fake:fake_x64_gcc"', 'chip_link_tests=true', 'chip_device_platform="fake"', + 'chip_fake_platform=true', ] ) return self.extra_gn_options diff --git a/scripts/build/testdata/build_linux_on_x64.txt b/scripts/build/testdata/build_linux_on_x64.txt index 33118450a90e8e..15cb6388a0ca6f 100644 --- a/scripts/build/testdata/build_linux_on_x64.txt +++ b/scripts/build/testdata/build_linux_on_x64.txt @@ -142,7 +142,7 @@ PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \ gn gen --check --fail-on-unused-args --export-compile-commands --root={root}/examples/tv-casting-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false target_cpu="arm64" is_clang=true chip_crypto="mbedtls" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-tv-casting-app-ipv6only' # Generating linux-fake-tests -gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=chip_build_tests=true custom_toolchain="//build/toolchain/fake:fake_x64_gcc" chip_link_tests=true chip_device_platform="fake"' {out}/linux-fake-tests +gn gen --check --fail-on-unused-args --export-compile-commands --root={root} '--args=chip_build_tests=true custom_toolchain="//build/toolchain/fake:fake_x64_gcc" chip_link_tests=true chip_device_platform="fake" chip_fake_platform=true' {out}/linux-fake-tests # Generating linux-x64-address-resolve-tool gn gen --check --fail-on-unused-args --export-compile-commands --root={root} {out}/linux-x64-address-resolve-tool diff --git a/src/app/tests/BUILD.gn b/src/app/tests/BUILD.gn index f9c3755c5d33df..fd8d1571623cf6 100644 --- a/src/app/tests/BUILD.gn +++ b/src/app/tests/BUILD.gn @@ -83,7 +83,6 @@ chip_test_suite("tests") { "TestEventOverflow.cpp", "TestEventPathParams.cpp", "TestFabricScopedEventLogging.cpp", - "TestFailSafeContext.cpp", "TestInteractionModelEngine.cpp", "TestMessageDef.cpp", "TestNumericAttributeTraits.cpp", @@ -96,6 +95,10 @@ chip_test_suite("tests") { "TestWriteInteraction.cpp", ] + if (!chip_fake_platform) { + test_sources += [ "TestFailSafeContext.cpp" ] + } + # # On NRF platforms, the allocation of a large number of pbufs in this test # to exercise chunking causes it to run out of memory. For now, disable it there.