From: Pino Toscano <toscano.pino@tiscali.it>
Date: Sat, 28 Feb 2015 10:04:09 +0000 (+0100)
Subject: subprocess_test: gracefully handle rlim.rlim_cur < kNumProcs
X-Git-Tag: v1.6.0^2~27^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de57020bd1f2bf4781c14375ed1717a44cac8016;p=platform%2Fupstream%2Fninja.git

subprocess_test: gracefully handle rlim.rlim_cur < kNumProcs

Instead of expecting that the number of open files is well above
kNumProcs, simply "skip" the test in that case, still printing the
message about the test limit (adding the current system limit too).
---

diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 8a0787c..7759863 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -177,8 +177,8 @@ TEST_F(SubprocessTest, SetWithLots) {
   // Make sure [ulimit -n] isn't going to stop us from working.
   rlimit rlim;
   ASSERT_EQ(0, getrlimit(RLIMIT_NOFILE, &rlim));
-  if (!EXPECT_GT(rlim.rlim_cur, kNumProcs)) {
-    printf("Raise [ulimit -n] well above %u to make this test go\n", kNumProcs);
+  if (rlim.rlim_cur < kNumProcs) {
+    printf("Raise [ulimit -n] well above %u (currently %lu) to make this test go\n", kNumProcs, rlim.rlim_cur);
     return;
   }