8e36f3cfff
update to 1.7.0 OBS-URL: https://build.opensuse.org/request/show/391883 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/ninja?expand=0&rev=26
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
--- ninja-1.7.0/src/subprocess_test.cc.orig 2016-04-27 21:17:10.000000000 +0200
|
|
+++ ninja-1.7.0/src/subprocess_test.cc 2016-04-28 07:18:42.227614370 +0200
|
|
@@ -214,39 +214,6 @@
|
|
}
|
|
}
|
|
|
|
-// 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).
|
|
-#if !defined(__APPLE__) && !defined(_WIN32)
|
|
-TEST_F(SubprocessTest, SetWithLots) {
|
|
- // Arbitrary big number; needs to be over 1024 to confirm we're no longer
|
|
- // hostage to pselect.
|
|
- const unsigned kNumProcs = 1025;
|
|
-
|
|
- // Make sure [ulimit -n] isn't going to stop us from working.
|
|
- rlimit rlim;
|
|
- ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlim));
|
|
- if (rlim.rlim_cur < kNumProcs) {
|
|
- printf("Raise [ulimit -n] above %u (currently %lu) to make this test go\n",
|
|
- kNumProcs, rlim.rlim_cur);
|
|
- return;
|
|
- }
|
|
-
|
|
- vector<Subprocess*> procs;
|
|
- for (size_t i = 0; i < kNumProcs; ++i) {
|
|
- Subprocess* subproc = subprocs_.Add("/bin/echo");
|
|
- ASSERT_NE((Subprocess *) 0, subproc);
|
|
- procs.push_back(subproc);
|
|
- }
|
|
- while (!subprocs_.running_.empty())
|
|
- subprocs_.DoWork();
|
|
- for (size_t i = 0; i < procs.size(); ++i) {
|
|
- ASSERT_EQ(ExitSuccess, procs[i]->Finish());
|
|
- ASSERT_NE("", procs[i]->GetOutput());
|
|
- }
|
|
- ASSERT_EQ(kNumProcs, subprocs_.finished_.size());
|
|
-}
|
|
-#endif // !__APPLE__ && !_WIN32
|
|
-
|
|
// TODO: this test could work on Windows, just not sure how to simply
|
|
// read stdin.
|
|
#ifndef _WIN32
|