From e8394feef787c48b23c3d927a5074dfbf3367c19 Mon Sep 17 00:00:00 2001 From: yuying-y <78829091+yuying-y@users.noreply.github.com> Date: Tue, 6 Aug 2024 10:28:48 -0700 Subject: [PATCH] Disable incompatible nplb_compat tests for AOSP (#3932) b/268486721 --- .../nplb/nplb_evergreen_compat_tests/crashpad_config_test.cc | 5 +++++ starboard/nplb/nplb_evergreen_compat_tests/fonts_test.cc | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/starboard/nplb/nplb_evergreen_compat_tests/crashpad_config_test.cc b/starboard/nplb/nplb_evergreen_compat_tests/crashpad_config_test.cc index 553c892ca81bb..b7fa6610c453d 100644 --- a/starboard/nplb/nplb_evergreen_compat_tests/crashpad_config_test.cc +++ b/starboard/nplb/nplb_evergreen_compat_tests/crashpad_config_test.cc @@ -36,6 +36,9 @@ class CrashpadConfigTest : public ::testing::Test { ~CrashpadConfigTest() {} }; +// These tests are not applicable to AOSP +#if !defined(ANDROID) + TEST_F(CrashpadConfigTest, VerifyUploadCert) { std::vector buffer(kSbFileMaxPath); ASSERT_TRUE(SbSystemGetPath(kSbSystemPathContentDirectory, buffer.data(), @@ -50,6 +53,8 @@ TEST_F(CrashpadConfigTest, VerifyUploadCert) { ASSERT_TRUE(stat(cert_location.c_str(), &info) == 0); } +#endif // !defined(ANDROID) + TEST_F(CrashpadConfigTest, VerifyCrashHandlerExtension) { auto crash_handler_extension = SbSystemGetExtension(kCobaltExtensionCrashHandlerName); diff --git a/starboard/nplb/nplb_evergreen_compat_tests/fonts_test.cc b/starboard/nplb/nplb_evergreen_compat_tests/fonts_test.cc index 1da56bdd77a45..3687ca189563e 100644 --- a/starboard/nplb/nplb_evergreen_compat_tests/fonts_test.cc +++ b/starboard/nplb/nplb_evergreen_compat_tests/fonts_test.cc @@ -24,7 +24,8 @@ #include "starboard/system.h" #include "testing/gtest/include/gtest/gtest.h" -#if SB_IS(EVERGREEN_COMPATIBLE) +// These tests are not applicable to AOSP +#if SB_IS(EVERGREEN_COMPATIBLE) && !defined(ANDROID) namespace starboard { namespace nplb { @@ -63,4 +64,4 @@ TEST(FontsTest, VerifySystemFontsConfigDirectory) { } // namespace nplb } // namespace starboard -#endif // SB_IS(EVERGREEN_COMPATIBLE) +#endif // SB_IS(EVERGREEN_COMPATIBLE) && !defined(ANDROID)