summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjgm <jgm@google.com>2012-03-09 17:12:39 (GMT)
committerjgm <jgm@google.com>2012-03-09 17:12:39 (GMT)
commitf0b86fc3b0f625e1db84f3632cb37bd9eae6ae19 (patch)
treedea331f222e639cfc37f481766bbc88ce20dc7cb /src
parentcfb40870bc74dc57616e286461a89c9f259b349d (diff)
downloadgoogletest-f0b86fc3b0f625e1db84f3632cb37bd9eae6ae19.zip
googletest-f0b86fc3b0f625e1db84f3632cb37bd9eae6ae19.tar.gz
googletest-f0b86fc3b0f625e1db84f3632cb37bd9eae6ae19.tar.bz2
Misc small updates to some debug death code, and to messages streaming to macros
Diffstat (limited to 'src')
-rw-r--r--src/gtest-port.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gtest-port.cc b/src/gtest-port.cc
index 9648eee..a0e2d7c 100644
--- a/src/gtest-port.cc
+++ b/src/gtest-port.cc
@@ -530,10 +530,15 @@ class CapturedStream {
<< temp_file_path;
filename_ = temp_file_path;
# else
- // There's no guarantee that a test has write access to the
- // current directory, so we create the temporary file in the /tmp
- // directory instead.
+ // There's no guarantee that a test has write access to the current
+ // directory, so we create the temporary file in the /tmp directory instead.
+ // We use /tmp on most systems, and /mnt/sdcard on Android. That's because
+ // Android doesn't have /tmp.
+# if GTEST_OS_LINUX_ANDROID
+ char name_template[] = "/mnt/sdcard/gtest_captured_stream.XXXXXX";
+# else
char name_template[] = "/tmp/captured_stream.XXXXXX";
+# endif // GTEST_OS_LINUX_ANDROID
const int captured_fd = mkstemp(name_template);
filename_ = name_template;
# endif // GTEST_OS_WINDOWS