diff options
| author | Evan Martin <martine@danga.com> | 2012-07-28 18:51:17 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-07-28 18:51:17 (GMT) |
| commit | 347bf761a0bc480acd2f505da97c08d98a58018c (patch) | |
| tree | 3b5d5114821596675103f4e0243db136fe70b0af | |
| parent | 0b4d514d2d86466742f36e9a304cb6c376ffe1c0 (diff) | |
| parent | db7066551ae75c0a304dd8cd365cf811ac345a53 (diff) | |
| download | Ninja-347bf761a0bc480acd2f505da97c08d98a58018c.zip Ninja-347bf761a0bc480acd2f505da97c08d98a58018c.tar.gz Ninja-347bf761a0bc480acd2f505da97c08d98a58018c.tar.bz2 | |
Merge pull request #385 from nico/nolotsonosx
Disable SubprocessTest.TestWithLots on OS X.
| -rw-r--r-- | src/subprocess_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc index 7dbaf97..d89525e 100644 --- a/src/subprocess_test.cc +++ b/src/subprocess_test.cc @@ -149,7 +149,9 @@ TEST_F(SubprocessTest, SetWithMulti) { } } -#ifndef _WIN32 +// OS X's process limit is less than 1025 by default +// (|sysctl kern.maxprocperuid| is 709 on 10.7 and 10.8 and less prior to that). +#ifdef linux TEST_F(SubprocessTest, SetWithLots) { // Arbitrary big number; needs to be over 1024 to confirm we're no longer // hostage to pselect. @@ -176,4 +178,4 @@ TEST_F(SubprocessTest, SetWithLots) { } ASSERT_EQ(kNumProcs, subprocs_.finished_.size()); } -#endif // _WIN32 +#endif // linux |