From 5c6fd053da8d726b8011a6e64e2a36725391de27 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Sun, 24 Jul 2016 17:31:08 -0400 Subject: [PATCH] disable the rlimit-limited test --- ninja-1.7.1-resource-intensive-test.patch | 16 ++++++++++++++++ ninja-build.spec | 6 ++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ninja-1.7.1-resource-intensive-test.patch diff --git a/ninja-1.7.1-resource-intensive-test.patch b/ninja-1.7.1-resource-intensive-test.patch new file mode 100644 index 0000000..255bc50 --- /dev/null +++ b/ninja-1.7.1-resource-intensive-test.patch @@ -0,0 +1,16 @@ +diff -u -r -U5 --no-dereference ninja-1.7.1/src/subprocess_test.cc ninja-1.7.1.resource-intensive-test/src/subprocess_test.cc +--- ninja-1.7.1/src/subprocess_test.cc 2016-04-28 10:56:44.000000000 -0400 ++++ ninja-1.7.1.resource-intensive-test/src/subprocess_test.cc 2016-07-24 17:29:42.783820341 -0400 +@@ -214,11 +214,11 @@ + } + } + + // 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 && !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; + diff --git a/ninja-build.spec b/ninja-build.spec index 42f124f..d38b7d8 100644 --- a/ninja-build.spec +++ b/ninja-build.spec @@ -8,6 +8,8 @@ Source0: https://github.com/martine/ninja/archive/v%{version}.tar.gz#/nin Source1: ninja.vim # Rename mentions of the executable name to be ninja-build. Patch1000: ninja-1.7.1-binary-rename.patch +# Disable a test which takes too many resources for koji. +Patch1001: ninja-1.7.1-resource-intensive-test.patch BuildRequires: asciidoc BuildRequires: gtest-devel BuildRequires: python2-devel @@ -24,6 +26,7 @@ fast as possible. %prep %setup -qn ninja-%{version} %patch1000 -p1 -b .binary-rename +%patch1001 -p1 -b .resource-intensive-test %build CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" \ @@ -43,8 +46,6 @@ install -pm644 %{SOURCE1} %{buildroot}%{_datadir}/vim/vimfiles/ftdetect/ninja.vi install -pm644 misc/zsh-completion %{buildroot}%{_datadir}/zsh/site-functions/_ninja %check -# workaround possible too low default limits -ulimit -n 4096 && ulimit -u 4096 ./ninja_test %files @@ -61,6 +62,7 @@ ulimit -n 4096 && ulimit -u 4096 * Sat Jul 23 2016 Ben Boeckel - 1.7.1-1 - update to 1.7.1 - fix bash completion for the binary rename (#1352330) +- disable test which fails to koji rlimit settings * Thu Feb 04 2016 Fedora Release Engineering - 1.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild