From 6a47f77739dcb8b52a27ab964a6a9e3351854b55 Mon Sep 17 00:00:00 2001 From: Paul Adenot Date: Wed, 12 Nov 2014 20:05:05 +0100 Subject: [PATCH] Bug 1083664 - Disable an assert in cubeb_audiounit.c for investigation. --HG-- extra : rebase_source : d46b6fb9d3da9a45ea94435a15bfc3bfee85e9d3 --- dom/media/tests/mochitest/mochitest.ini | 4 ++-- media/libcubeb/src/cubeb_audiounit.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index a351fd3bc9ba..479990d8d0be 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -1,6 +1,6 @@ [DEFAULT] -# contentSandbox - bug 1042735, Android 2.3 - bug 981881, OSX debug - bug 1083664 -skip-if = (os == 'win' && contentSandbox != 'off') || android_version == '10' || (os == 'mac' && debug) +# contentSandbox - bug 1042735, Android 2.3 - bug 981881 +skip-if = (os == 'win' && contentSandbox != 'off') || android_version == '10' support-files = head.js constraints.js diff --git a/media/libcubeb/src/cubeb_audiounit.c b/media/libcubeb/src/cubeb_audiounit.c index 558f0688ec02..0c2d89804eb4 100644 --- a/media/libcubeb/src/cubeb_audiounit.c +++ b/media/libcubeb/src/cubeb_audiounit.c @@ -447,7 +447,8 @@ audiounit_destroy(cubeb * ctx) { int r; - assert(ctx->active_streams == 0); + // Disabling this assert for bug 1083664 -- we seem to leak a stream + // assert(ctx->active_streams == 0); r = pthread_mutex_destroy(&ctx->mutex); assert(r == 0);