Index: base/test/multiprocess_test_android.cc |
diff --git a/base/test/multiprocess_test_android.cc b/base/test/multiprocess_test_android.cc |
index cc45d0674eb11729d5314aaec1c1a34819c80066..a61441f0216b54ad5bce1dae7ce332fdd2587615 100644 |
--- a/base/test/multiprocess_test_android.cc |
+++ b/base/test/multiprocess_test_android.cc |
@@ -6,7 +6,9 @@ |
#include <unistd.h> |
+#include "base/hash_tables.h" |
#include "base/logging.h" |
+#include "base/posix/eintr_wrapper.h" |
#include "base/process.h" |
#include "testing/multiprocess_func_list.h" |
@@ -15,24 +17,46 @@ namespace base { |
// A very basic implementation for android. On Android tests can run in an APK |
// and we don't have an executable to exec*. This implementation does the bare |
// minimum to execute the method specified by procname (in the child process). |
-// - File descriptors are not closed and hence |fds_to_map| is ignored. |
// - |debug_on_start| is ignored. |
ProcessHandle MultiProcessTest::SpawnChildImpl( |
const std::string& procname, |
- const FileHandleMappingVector& fds_to_map, |
+ const FileHandleMappingVector& fds_to_remap, |
bool debug_on_start) { |
pid_t pid = fork(); |
if (pid < 0) { |
- DPLOG(ERROR) << "fork"; |
+ PLOG(ERROR) << "fork"; |
return kNullProcessHandle; |
- } else if (pid == 0) { |
- // Child process. |
- _exit(multi_process_function_list::InvokeChildProcessTest(procname)); |
} |
- |
- // Parent process. |
- return pid; |
+ if (pid > 0) { |
+ // Parent process. |
+ return pid; |
+ } |
+ // Child process. |
+ std::hash_set<int> fds_to_keep_open; |
+ for (FileHandleMappingVector::const_iterator it = fds_to_remap.begin(); |
+ it != fds_to_remap.end(); ++it) { |
+ fds_to_keep_open.insert(it->first); |
+ } |
+ // Keep stdin, stdout and stderr open since this is not meant to spawn a |
+ // daemon. |
+ const int kFdForAndroidLogging = 3; // FD used by __android_log_write(). |
+ for (int fd = kFdForAndroidLogging + 1; fd < getdtablesize(); ++fd) { |
+ if (fds_to_keep_open.find(fd) == fds_to_keep_open.end()) { |
+ HANDLE_EINTR(close(fd)); |
+ } |
+ } |
+ for (FileHandleMappingVector::const_iterator it = fds_to_remap.begin(); |
+ it != fds_to_remap.end(); ++it) { |
+ int old_fd = it->first; |
+ int new_fd = it->second; |
+ if (dup2(old_fd, new_fd) < 0) { |
+ PLOG(FATAL) << "dup2"; |
+ } |
+ HANDLE_EINTR(close(old_fd)); |
+ } |
+ _exit(multi_process_function_list::InvokeChildProcessTest(procname)); |
+ return 0; |
} |
} // namespace base |