Bug 1884026 - Don't build death tests on platforms that don't support them. r=media-playback-reviewers,cubeb-reviewers,padenot

Differential Revision: https://phabricator.services.mozilla.com/D203846
This commit is contained in:
Mike Hommey 2024-03-14 00:09:29 +00:00
Родитель 418078da5e
Коммит 3bf9d367c1
4 изменённых файлов: 37 добавлений и 1 удалений

Просмотреть файл

@ -15,7 +15,7 @@ using namespace mozilla::gtest;
using namespace mozilla::media;
// Spawning the death test child process aborts on Android.
#if !defined(ANDROID)
#if !defined(ANDROID) && defined(GTEST_HAS_DEATH_TEST)
// Kept here for reference as it can be handy during development.
# define DISABLE_CRASH_REPORTING \

Просмотреть файл

@ -0,0 +1,33 @@
From 68ef0eb5691aa7b9d634b4d1af85f9d66fdfc06e Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Thu, 7 Mar 2024 08:01:32 +0900
Subject: [PATCH] Only build duplex_collection_change_no_unregister when death
tests are supported
---
test/test_duplex.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/test/test_duplex.cpp b/test/test_duplex.cpp
index 518f44f..98a6701 100644
--- a/test/test_duplex.cpp
+++ b/test/test_duplex.cpp
@@ -201,6 +201,7 @@ TEST(cubeb, duplex_collection_change)
ASSERT_EQ(r, CUBEB_OK);
}
+#ifdef GTEST_HAS_DEATH_TEST
TEST(cubeb, duplex_collection_change_no_unregister)
{
cubeb * ctx;
@@ -221,6 +222,7 @@ TEST(cubeb, duplex_collection_change_no_unregister)
duplex_collection_change_impl(ctx);
}
+#endif
long
data_cb_input(cubeb_stream * stream, void * user, const void * inputbuffer,
--
2.44.0.1.g9765aa7075

Просмотреть файл

@ -19,6 +19,7 @@ vendoring:
patches:
- 0001-disable-aaudio-before-android-31.patch
- 0002-disable-crash-reporter-death-test.patch
- 0003-Only-build-duplex_collection_change_no_unregister-wh.patch
skip-vendoring-steps:
- update-moz-build
exclude:

Просмотреть файл

@ -203,6 +203,7 @@ TEST(cubeb, duplex_collection_change)
ASSERT_EQ(r, CUBEB_OK);
}
#ifdef GTEST_HAS_DEATH_TEST
TEST(cubeb, duplex_collection_change_no_unregister)
{
cubeb * ctx;
@ -225,6 +226,7 @@ TEST(cubeb, duplex_collection_change_no_unregister)
duplex_collection_change_impl(ctx);
}
#endif
long
data_cb_input(cubeb_stream * stream, void * user, const void * inputbuffer,