exclude test by cli argument instead of patch

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2017-09-04 09:17:34 +02:00
parent 33375e52cb
commit 8f6a5bb50d
2 changed files with 1 additions and 28 deletions

View File

@ -1,26 +0,0 @@
From 0b06a4ddd8da8d7e6d0de78a0fd3facd0739fcba Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Date: Mon, 28 Nov 2016 20:01:20 +0100
Subject: [PATCH 2/2] Disable test which takes too many resources for koji
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
---
src/subprocess_test.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 0a8c206..38dfd4a 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -214,7 +214,7 @@ TEST_F(SubprocessTest, SetWithMulti) {
}
}
-#if defined(USE_PPOLL)
+#if 0 && defined(USE_PPOLL)
TEST_F(SubprocessTest, SetWithLots) {
// Arbitrary big number; needs to be over 1024 to confirm we're no longer
// hostage to pselect.
--
2.10.2

View File

@ -8,7 +8,6 @@ Source0: https://github.com/martine/ninja/archive/v%{version}.tar.gz#/nin
Source1: ninja.vim Source1: ninja.vim
Source2: macros.ninja Source2: macros.ninja
Patch0001: 0001-Work-around-mtime-being-set-to-0-sometimes.patch Patch0001: 0001-Work-around-mtime-being-set-to-0-sometimes.patch
Patch0002: 0002-Disable-test-which-takes-too-many-resources-for-koji.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
%if 0%{?rhel} && 0%{?rhel} <= 7 %if 0%{?rhel} && 0%{?rhel} <= 7
BuildRequires: python2-devel BuildRequires: python2-devel
@ -54,7 +53,7 @@ install -Dpm0644 %{S:2} %{buildroot}%{rpmmacrodir}/macros.ninja
ln -s ninja %{buildroot}%{_bindir}/ninja-build ln -s ninja %{buildroot}%{_bindir}/ninja-build
%check %check
./ninja_test ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots
%files %files
%license COPYING %license COPYING