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

Side by Side Diff: util/test/multiprocess_exec_test.cc

Issue 880763002: Reorganize Multiprocess and implement for Windows (Closed) Base URL: https://chromium.googlesource.com/crashpad/crashpad@master
Patch Set: fixes 2 Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « util/test/multiprocess_exec_posix.cc ('k') | util/test/multiprocess_exec_test_child.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Crashpad Authors. All rights reserved. 1 // Copyright 2014 The Crashpad Authors. All rights reserved.
2 // 2 //
3 // Licensed under the Apache License, Version 2.0 (the "License"); 3 // Licensed under the Apache License, Version 2.0 (the "License");
4 // you may not use this file except in compliance with the License. 4 // you may not use this file except in compliance with the License.
5 // You may obtain a copy of the License at 5 // You may obtain a copy of the License at
6 // 6 //
7 // http://www.apache.org/licenses/LICENSE-2.0 7 // http://www.apache.org/licenses/LICENSE-2.0
8 // 8 //
9 // Unless required by applicable law or agreed to in writing, software 9 // Unless required by applicable law or agreed to in writing, software
10 // distributed under the License is distributed on an "AS IS" BASIS, 10 // distributed under the License is distributed on an "AS IS" BASIS,
11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 11 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12 // See the License for the specific language governing permissions and 12 // See the License for the specific language governing permissions and
13 // limitations under the License. 13 // limitations under the License.
14 14
15 #include "util/test/multiprocess_exec.h" 15 #include "util/test/multiprocess_exec.h"
16 16
17 #include "base/basictypes.h" 17 #include "base/basictypes.h"
18 #include "base/strings/utf_string_conversions.h"
19 #include "build/build_config.h"
18 #include "gtest/gtest.h" 20 #include "gtest/gtest.h"
19 #include "util/file/file_io.h" 21 #include "util/file/file_io.h"
20 #include "util/test/executable_path.h" 22 #include "util/test/executable_path.h"
21 23
22 namespace crashpad { 24 namespace crashpad {
23 namespace test { 25 namespace test {
24 namespace { 26 namespace {
25 27
26 class TestMultiprocessExec final : public MultiprocessExec { 28 class TestMultiprocessExec final : public MultiprocessExec {
27 public: 29 public:
28 TestMultiprocessExec() : MultiprocessExec() {} 30 TestMultiprocessExec() : MultiprocessExec() {}
29 31
30 ~TestMultiprocessExec() {} 32 ~TestMultiprocessExec() {}
31 33
32 private: 34 private:
33 void MultiprocessParent() override { 35 void MultiprocessParent() override {
34 // Use Logging*FD() instead of Checked*FD() so that the test can fail 36 // Use Logging*File() instead of Checked*File() so that the test can fail
35 // gracefully with a gtest assertion if the child does not execute properly. 37 // gracefully with a gtest assertion if the child does not execute properly.
36 38
37 char c = 'z'; 39 char c = 'z';
38 ASSERT_TRUE(LoggingWriteFile(WritePipeFD(), &c, 1)); 40 ASSERT_TRUE(LoggingWriteFile(WritePipeHandle(), &c, 1));
39 41
40 ASSERT_TRUE(LoggingReadFile(ReadPipeFD(), &c, 1)); 42 ASSERT_TRUE(LoggingReadFile(ReadPipeHandle(), &c, 1));
41 EXPECT_EQ('Z', c); 43 EXPECT_EQ('Z', c);
42 } 44 }
43 45
44 DISALLOW_COPY_AND_ASSIGN(TestMultiprocessExec); 46 DISALLOW_COPY_AND_ASSIGN(TestMultiprocessExec);
45 }; 47 };
46 48
47 TEST(MultiprocessExec, MultiprocessExec) { 49 TEST(MultiprocessExec, MultiprocessExec) {
48 TestMultiprocessExec multiprocess_exec; 50 TestMultiprocessExec multiprocess_exec;
49 base::FilePath test_executable = ExecutablePath(); 51 base::FilePath test_executable = ExecutablePath();
52 #if defined(OS_POSIX)
53 std::string child_test_executable = test_executable.value();
54 #elif defined(OS_WIN)
50 std::string child_test_executable = 55 std::string child_test_executable =
51 test_executable.value() + "_multiprocess_exec_test_child"; 56 base::UTF16ToUTF8(test_executable.RemoveFinalExtension().value());
57 #endif // OS_POSIX
58 child_test_executable += "_multiprocess_exec_test_child";
59 #if defined(OS_WIN)
60 child_test_executable += ".exe";
61 #endif
52 multiprocess_exec.SetChildCommand(child_test_executable, nullptr); 62 multiprocess_exec.SetChildCommand(child_test_executable, nullptr);
53 multiprocess_exec.Run(); 63 multiprocess_exec.Run();
54 } 64 }
55 65
56 } // namespace 66 } // namespace
57 } // namespace test 67 } // namespace test
58 } // namespace crashpad 68 } // namespace crashpad
OLDNEW
« no previous file with comments | « util/test/multiprocess_exec_posix.cc ('k') | util/test/multiprocess_exec_test_child.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698