Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: media/base/run_all_unittests.cc

Issue 26883002: Introduce base::TestSuite::DisableTests(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: now works on Android Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/run_all_unittests.cc
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index fe097f11a71a8cc0f405fa5b70d03f6de6747c10..c0174fa8d9c3245b6668f8ab9bbef2cdab7e3456 100644
--- a/media/base/run_all_unittests.cc
+++ b/media/base/run_all_unittests.cc
@@ -12,10 +12,13 @@
#if defined(OS_ANDROID)
#include "base/android/jni_android.h"
+#include "media/base/android/media_codec_bridge.h"
#include "media/base/android/media_jni_registrar.h"
#include "ui/gl/android/gl_jni_registrar.h"
#endif
+#include "testing/gtest/include/gtest/gtest.h"
+
class TestSuiteNoAtExit : public base::TestSuite {
public:
TestSuiteNoAtExit(int argc, char** argv) : TestSuite(argc, argv) {}
@@ -29,6 +32,11 @@ void TestSuiteNoAtExit::Initialize() {
base::TestSuite::Initialize();
#if defined(OS_ANDROID)
+ if (!media::MediaCodecBridge::IsAvailable()) {
+ base::TestSuite::DisableTests("MediaCodecBridgeTest.*");
+ base::TestSuite::DisableTests("MediaSourcePlayerTest.*");
+ }
+
// Register JNI bindings for android.
JNIEnv* env = base::android::AttachCurrentThread();
// Needed for surface texture support.
« no previous file with comments | « media/base/android/media_source_player_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698