mirror of
git://git.savannah.gnu.org/guix.git
synced 2023-12-14 03:33:07 +01:00
Efraim Flashner
dbd6bc5cc6
* gnu/packages/ninja.scm (ninja): Update to 1.7.1. * gnu/packages/patches/ninja-tests.patch: Update patch.
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 67d6b9262efad99f8aad63ab81efc8e689748766 Mon Sep 17 00:00:00 2001
|
|
From: Efraim Flashner <efraim@flashner.co.il>
|
|
Date: Sun, 3 Jul 2016 11:55:43 +0300
|
|
Subject: [PATCH] patch
|
|
|
|
---
|
|
src/subprocess_test.cc | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
|
|
index ee16190..a537c11 100644
|
|
--- a/src/subprocess_test.cc
|
|
+++ b/src/subprocess_test.cc
|
|
@@ -72,6 +72,7 @@ TEST_F(SubprocessTest, NoSuchCommand) {
|
|
|
|
#ifndef _WIN32
|
|
|
|
+#if 0
|
|
TEST_F(SubprocessTest, InterruptChild) {
|
|
Subprocess* subproc = subprocs_.Add("kill -INT $$");
|
|
ASSERT_NE((Subprocess *) 0, subproc);
|
|
@@ -82,6 +83,7 @@ TEST_F(SubprocessTest, InterruptChild) {
|
|
|
|
EXPECT_EQ(ExitInterrupted, subproc->Finish());
|
|
}
|
|
+#endif
|
|
|
|
TEST_F(SubprocessTest, InterruptParent) {
|
|
Subprocess* subproc = subprocs_.Add("kill -INT $PPID ; sleep 1");
|
|
@@ -217,6 +219,7 @@ TEST_F(SubprocessTest, SetWithMulti) {
|
|
// 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)
|
|
+#if 0
|
|
TEST_F(SubprocessTest, SetWithLots) {
|
|
// Arbitrary big number; needs to be over 1024 to confirm we're no longer
|
|
// hostage to pselect.
|
|
@@ -245,6 +248,7 @@ TEST_F(SubprocessTest, SetWithLots) {
|
|
}
|
|
ASSERT_EQ(kNumProcs, subprocs_.finished_.size());
|
|
}
|
|
+#endif
|
|
#endif // !__APPLE__ && !_WIN32
|
|
|
|
// TODO: this test could work on Windows, just not sure how to simply
|
|
--
|
|
2.9.0
|
|
|