Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(701)

Unified Diff: base/test/launcher/test_launcher.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/test/launcher/test_launcher.cc
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index 1d480608eb147298bfe43870a6e322e3095a5c6f..521f69c1ed5f4466eecb2ac77505021a25a2315c 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -150,7 +150,7 @@ class SignalFDWatcher : public MessageLoopForIO::Watcher {
KillSpawnedTestProcesses();
// The signal would normally kill the process, so exit now.
- exit(1);
+ _exit(1);
}
void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
@@ -310,7 +310,7 @@ int LaunchChildTestProcessWithOptions(const CommandLine& command_line,
exit_code = -1; // Set a non-zero exit code to signal a failure.
// Ensure that the process terminates.
- KillProcess(process.Handle(), -1, true);
+ process.Terminate(-1, true);
}
{
@@ -570,7 +570,7 @@ void TestLauncher::OnTestFinished(const TestResult& result) {
}
if (print_snippet) {
std::vector<std::string> snippet_lines;
- SplitString(result.output_snippet, '\n', &snippet_lines);
+ SplitStringDontTrim(result.output_snippet, '\n', &snippet_lines);
if (snippet_lines.size() > kOutputSnippetLinesLimit) {
size_t truncated_size = snippet_lines.size() - kOutputSnippetLinesLimit;
snippet_lines.erase(

Powered by Google App Engine
This is Rietveld 408576698