Disable incompatible nplb_compat tests for AOSP (#3932)

b/268486721
youtube · Aug 6, 2024 · e8394fe · e8394fe
1 parent 334ac2b
commit e8394fe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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<char> 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
@@ -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)