From 78bf6d5724e733cce313228856e18d5c372b4fb3 Mon Sep 17 00:00:00 2001
From: vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>
Date: Wed, 19 Sep 2012 17:58:01 +0000
Subject: Improves Android support (by David Turner).

---
 test/gtest-filepath_test.cc | 2 ++
 test/gtest_unittest.cc      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/gtest-filepath_test.cc b/test/gtest-filepath_test.cc
index 66d41184..3196ea05 100644
--- a/test/gtest-filepath_test.cc
+++ b/test/gtest-filepath_test.cc
@@ -543,6 +543,8 @@ class DirectoryCreationTest : public Test {
       return String(temp_dir);
     else
       return String::Format("%s\\", temp_dir);
+#elif GTEST_OS_LINUX_ANDROID
+    return String("/sdcard/");
 #else
     return String("/tmp/");
 #endif  // GTEST_OS_WINDOWS_MOBILE
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index 31a45656..79e11b62 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -1275,7 +1275,7 @@ TEST(StringTest, FormatWorks) {
   EXPECT_STREQ("<formatting error or buffer exceeded>",
                String::Format("x%s", buffer).c_str());
 
-#if GTEST_OS_LINUX
+#if GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
   // On Linux, invalid format spec should lead to an error message.
   // In other environment (e.g. MSVC on Windows), String::Format() may
   // simply ignore a bad format spec, so this assertion is run on
-- 
cgit v1.2.3