Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 06:09:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1919212 - Only disable crash reporter in child process in test_duplex.cpp. r=pehrsons,cubeb-reviewers

Browse Source 
Death test work by forking. We want to disable the crash reporter only in the
forked process.

Differential Revision: https://phabricator.services.mozilla.com/D222468
This commit is contained in:
Paul Adenot 2024-09-17 14:09:38 +00:00
parent f996a9241f
commit d97141c765
2 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
media/libcubeb/0002-disable-crash-reporter-death-test.patch
View File

@ -1,5 +1,5 @@
diff --git a/test/test_duplex.cpp b/test/test_duplex.cpp diff -U8 b/test/test_duplex.cpp b/test/test_duplex.cpp
--- a/test/test_duplex.cpp --- b/test/test_duplex.cpp
+++ b/test/test_duplex.cpp +++ b/test/test_duplex.cpp
@@ -13,16 +13,18 @@ @@ -13,16 +13,18 @@
#endif #endif
@ -20,22 +20,46 @@ diff --git a/test/test_duplex.cpp b/test/test_duplex.cpp
#define STREAM_FORMAT CUBEB_SAMPLE_FLOAT32LE #define STREAM_FORMAT CUBEB_SAMPLE_FLOAT32LE
#define INPUT_CHANNELS 1 #define INPUT_CHANNELS 1
#define INPUT_LAYOUT CUBEB_LAYOUT_MONO #define INPUT_LAYOUT CUBEB_LAYOUT_MONO
@@ -202,16 +204,18 @@ TEST(cubeb, duplex_collection_change) @@ -199,16 +201,21 @@
duplex_collection_change_impl(ctx);
r = cubeb_register_device_collection_changed(
ctx, static_cast<cubeb_device_type>(CUBEB_DEVICE_TYPE_INPUT), nullptr,
nullptr);
ASSERT_EQ(r, CUBEB_OK);
} }
+void CauseDeath(cubeb * p) {
+ mozilla::gtest::DisableCrashReporter();
+ cubeb_destroy(p);
+}
+
#ifdef GTEST_HAS_DEATH_TEST #ifdef GTEST_HAS_DEATH_TEST
TEST(cubeb, duplex_collection_change_no_unregister) TEST(cubeb, duplex_collection_change_no_unregister)
{ {
cubeb * ctx; cubeb * ctx;
int r; int r;
+ mozilla::gtest::DisableCrashReporter();
+
r = common_init(&ctx, "Cubeb duplex example with collection change"); r = common_init(&ctx, "Cubeb duplex example with collection change");
ASSERT_EQ(r, CUBEB_OK) << "Error initializing cubeb library"; ASSERT_EQ(r, CUBEB_OK) << "Error initializing cubeb library";
@@ -216,17 +223,19 @@
/* This test needs an available input device, skip it if this host does not /* This test needs an available input device, skip it if this host does not
* have one. */ * have one. */
if (!can_run_audio_input_test(ctx)) { if (!can_run_audio_input_test(ctx)) {
cubeb_destroy(ctx); cubeb_destroy(ctx);
return; return;
}
std::unique_ptr<cubeb, decltype(&cubeb_destroy)> cleanup_cubeb_at_exit(
- ctx, [](cubeb * p) noexcept { EXPECT_DEATH(cubeb_destroy(p), ""); });
+ ctx, [](cubeb* p) noexcept {
+ EXPECT_DEATH(CauseDeath(p), "");
+ });
duplex_collection_change_impl(ctx);
}
#endif
long
data_cb_input(cubeb_stream * stream, void * user, const void * inputbuffer,
void * outputbuffer, long nframes)

9
media/libcubeb/test/test_duplex.cpp
View File

@ -206,6 +206,11 @@ TEST(cubeb, duplex_collection_change)
ASSERT_EQ(r, CUBEB_OK); ASSERT_EQ(r, CUBEB_OK);
} }
void CauseDeath(cubeb * p) {
mozilla::gtest::DisableCrashReporter();
cubeb_destroy(p);
}
#ifdef GTEST_HAS_DEATH_TEST #ifdef GTEST_HAS_DEATH_TEST
TEST(cubeb, duplex_collection_change_no_unregister) TEST(cubeb, duplex_collection_change_no_unregister)
{ {
@ -225,7 +230,9 @@ TEST(cubeb, duplex_collection_change_no_unregister)
} }
std::unique_ptr<cubeb, decltype(&cubeb_destroy)> cleanup_cubeb_at_exit( std::unique_ptr<cubeb, decltype(&cubeb_destroy)> cleanup_cubeb_at_exit(
ctx, [](cubeb * p) noexcept { EXPECT_DEATH(cubeb_destroy(p), ""); }); ctx, [](cubeb* p) noexcept {
EXPECT_DEATH(CauseDeath(p), "");
});
duplex_collection_change_impl(ctx); duplex_collection_change_impl(ctx);
} }