commit bb738733ea2d6c9e36e1cd0067fe12a3eae75da4
author phoglund <phoglund@webrtc.org> Fri Jul 15 03:57:12 2016 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 15 10:57:17 2016 +0000
tree 2c3b940d2afd15a8fb5d03853852e2caf4de4943
parent 9d34148714773339a4e8396bd28aceb571554d36

Disable broken Android rtc_unittests.

After disabling all of these, the rest of the tests pass, at least on
my Nexus 7 device.

BUG=webrtc:4364

Review-Url: https://codereview.webrtc.org/2151823002
Cr-Commit-Position: refs/heads/master@{#13485}

webrtc/base/optionsfile_unittest.cc

diff --git a/webrtc/base/optionsfile_unittest.cc b/webrtc/base/optionsfile_unittest.cc
index f22a2f1..bc3d38e 100644
--- a/webrtc/base/optionsfile_unittest.cc
+++ b/webrtc/base/optionsfile_unittest.cc
@@ -35,16 +35,23 @@
 static int kNegInt = -634;
 static int kZero = 0;
 
-class OptionsFileTest : public testing::Test {
+#if defined (WEBRTC_ANDROID)
+// Fails on Android: https://bugs.chromium.org/p/webrtc/issues/detail?id=4364.
+#define MAYBE_OptionsFileTest DISABLED_OptionsFileTest
+#else
+#define MAYBE_OptionsFileTest OptionsFileTest
+#endif
+
+class MAYBE_OptionsFileTest : public testing::Test {
  public:
-  OptionsFileTest() {
+  MAYBE_OptionsFileTest() {
     Pathname dir;
     ASSERT(Filesystem::GetTemporaryFolder(dir, true, NULL));
     test_file_ = Filesystem::TempFilename(dir, ".testfile");
     OpenStore();
   }
 
-  ~OptionsFileTest() override {
+  ~MAYBE_OptionsFileTest() override {
     remove(test_file_.c_str());
   }
 
@@ -59,7 +66,7 @@
   std::string test_file_;
 };
 
-TEST_F(OptionsFileTest, GetSetString) {
+TEST_F(MAYBE_OptionsFileTest, GetSetString) {
   // Clear contents of the file on disk.
   EXPECT_TRUE(store_->Save());
   std::string out1, out2;
@@ -85,7 +92,7 @@
   EXPECT_FALSE(store_->GetStringValue(kTestOptionB, &out2));
 }
 
-TEST_F(OptionsFileTest, GetSetInt) {
+TEST_F(MAYBE_OptionsFileTest, GetSetInt) {
   // Clear contents of the file on disk.
   EXPECT_TRUE(store_->Save());
   int out1, out2;
@@ -117,7 +124,7 @@
   EXPECT_EQ(kZero, out1);
 }
 
-TEST_F(OptionsFileTest, Persist) {
+TEST_F(MAYBE_OptionsFileTest, Persist) {
   // Clear contents of the file on disk.
   EXPECT_TRUE(store_->Save());
   EXPECT_TRUE(store_->SetStringValue(kTestOptionA, kTestString1));
@@ -135,7 +142,7 @@
   EXPECT_EQ(kNegInt, out2);
 }
 
-TEST_F(OptionsFileTest, SpecialCharacters) {
+TEST_F(MAYBE_OptionsFileTest, SpecialCharacters) {
   // Clear contents of the file on disk.
   EXPECT_TRUE(store_->Save());
   std::string out;