| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #define _CRT_SECURE_NO_WARNINGS | 5 #define _CRT_SECURE_NO_WARNINGS |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/alias.h" | 10 #include "base/debug/alias.h" |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 #else | 661 #else |
| 662 CHECK(base::WaitForSingleProcess(handle, base::TimeDelta::FromSeconds(1))); | 662 CHECK(base::WaitForSingleProcess(handle, base::TimeDelta::FromSeconds(1))); |
| 663 #endif | 663 #endif |
| 664 base::CloseProcessHandle(handle); | 664 base::CloseProcessHandle(handle); |
| 665 ret = HANDLE_EINTR(close(fds[0])); | 665 ret = HANDLE_EINTR(close(fds[0])); |
| 666 DPCHECK(ret == 0); | 666 DPCHECK(ret == 0); |
| 667 | 667 |
| 668 return num_open_files; | 668 return num_open_files; |
| 669 } | 669 } |
| 670 | 670 |
| 671 #if defined(ADDRESS_SANITIZER) | 671 #if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) |
| 672 // ProcessUtilTest.FDRemapping is flaky when ran under xvfb-run on Precise. | 672 // ProcessUtilTest.FDRemapping is flaky when ran under xvfb-run on Precise. |
| 673 // The problem is 100% reproducible with ASan. See http://crbug.com/136720. | 673 // The problem is 100% reproducible with both ASan and TSan. |
| 674 // See http://crbug.com/136720. |
| 674 #define MAYBE_FDRemapping DISABLED_FDRemapping | 675 #define MAYBE_FDRemapping DISABLED_FDRemapping |
| 675 #else | 676 #else |
| 676 #define MAYBE_FDRemapping FDRemapping | 677 #define MAYBE_FDRemapping FDRemapping |
| 677 #endif | 678 #endif |
| 678 TEST_F(ProcessUtilTest, MAYBE_FDRemapping) { | 679 TEST_F(ProcessUtilTest, MAYBE_FDRemapping) { |
| 679 int fds_before = CountOpenFDsInChild(); | 680 int fds_before = CountOpenFDsInChild(); |
| 680 | 681 |
| 681 // open some dummy fds to make sure they don't propagate over to the | 682 // open some dummy fds to make sure they don't propagate over to the |
| 682 // child process. | 683 // child process. |
| 683 int dev_null = open("/dev/null", O_RDONLY); | 684 int dev_null = open("/dev/null", O_RDONLY); |
| (...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1282 SetUpInDeathAssert(); | 1283 SetUpInDeathAssert(); |
| 1283 while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {} | 1284 while ((value_ = base::AllocatePsychoticallyBigObjCObject())) {} |
| 1284 }, ""); | 1285 }, ""); |
| 1285 } | 1286 } |
| 1286 | 1287 |
| 1287 #endif // !ARCH_CPU_64_BITS | 1288 #endif // !ARCH_CPU_64_BITS |
| 1288 #endif // OS_MACOSX | 1289 #endif // OS_MACOSX |
| 1289 | 1290 |
| 1290 #endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && | 1291 #endif // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && |
| 1291 // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) | 1292 // !defined(OS_WIN) && !defined(ADDRESS_SANITIZER) |
| OLD | NEW |