Merge "Only use $EXTERNAL_STORAGE if it exists and is writable."tools_r22jb-mr1.1-dev-plus-aosp

1 files changed, 12 insertions, 5 deletions

diff --git a/src/gtest-port.cc b/src/gtest-port.cc
index 01c5e1e..f914dbc 100644
--- a/src/gtest-port.cc
+++ b/src/gtest-port.cc
@@ -508,16 +508,23 @@ class CapturedStream {
 // ANDROID
 #elif GTEST_OS_LINUX_ANDROID
     // Get $EXTERNAL_STORAGE from the environment, since this can change
-    // for shell users (fallback is still /sdcard, but this probably will
-    // never work properly again).
-    ::std::string external_storage = "/sdcard";
+    // for shell users (fallback is /data/nativetest, for emulator users).
+    ::std::string external_storage = "/data/nativetest";
     char *sdcard_path = getenv("EXTERNAL_STORAGE");
-    if (sdcard_path) {
-      external_storage = sdcard_path;
+    if (sdcard_path != NULL) {
+      // Check that $EXTERNAL_STORAGE exists and is writable before trying to use it.
+      struct stat sb;
+      if (stat(sdcard_path, &sb) != -1) {
+        if ((sb.st_mode & S_IWUSR) != 0) {
+          external_storage = sdcard_path;
+        }
+      }
     }
     external_storage += "/captured_stderr.XXXXXX";
     char *name_template = strdup(external_storage.c_str());
     const int captured_fd = mkstemp(name_template);
+    GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file "
+                                    << name_template;
     filename_ = name_template;
     free(name_template);
     name_template = NULL;