Accepting request 247260 from home:mlschroe:branches:Base:System
-> OBS-URL: https://build.opensuse.org/request/show/247260 OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=41
This commit is contained in:
parent
cd4304ce46
commit
c48f717693
46
make-testcases_timeout.diff
Normal file
46
make-testcases_timeout.diff
Normal file
@ -0,0 +1,46 @@
|
||||
diff -rNU 20 ../make-4.0-o/tests/test_driver.pl ./tests/test_driver.pl
|
||||
--- ../make-4.0-o/tests/test_driver.pl 2013-10-09 08:05:39.000000000 +0200
|
||||
+++ ./tests/test_driver.pl 2014-03-11 14:08:15.000000000 +0100
|
||||
@@ -33,41 +33,41 @@
|
||||
|
||||
# The number of test categories we've run
|
||||
$categories_run = 0;
|
||||
# The number of test categroies that have passed
|
||||
$categories_passed = 0;
|
||||
# The total number of individual tests that have been run
|
||||
$total_tests_run = 0;
|
||||
# The total number of individual tests that have passed
|
||||
$total_tests_passed = 0;
|
||||
# The number of tests in this category that have been run
|
||||
$tests_run = 0;
|
||||
# The number of tests in this category that have passed
|
||||
$tests_passed = 0;
|
||||
|
||||
|
||||
# Yeesh. This whole test environment is such a hack!
|
||||
$test_passed = 1;
|
||||
|
||||
|
||||
# Timeout in seconds. If the test takes longer than this we'll fail it.
|
||||
-$test_timeout = 5;
|
||||
+$test_timeout = 8;
|
||||
|
||||
# Path to Perl
|
||||
$perl_name = $^X;
|
||||
|
||||
# %makeENV is the cleaned-out environment.
|
||||
%makeENV = ();
|
||||
|
||||
# %extraENV are any extra environment variables the tests might want to set.
|
||||
# These are RESET AFTER EVERY TEST!
|
||||
%extraENV = ();
|
||||
|
||||
# %origENV is the caller's original environment
|
||||
%origENV = %ENV;
|
||||
|
||||
sub resetENV
|
||||
{
|
||||
# We used to say "%ENV = ();" but this doesn't work in Perl 5.000
|
||||
# through Perl 5.004. It was fixed in Perl 5.004_01, but we don't
|
||||
# want to require that here, so just delete each one individually.
|
||||
foreach $v (keys %ENV) {
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 11 14:10:15 CET 2014 - draht@suse.de
|
||||
|
||||
- make-testcases_timeout.diff: increase the timeout of test cases
|
||||
from 5 to 8 seconds. With some testcases using sleep with 2
|
||||
seconds or more, the tests can fail erroneously on a busy build
|
||||
system.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 12:51:32 UTC 2013 - sweet_f_a@gmx.de
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package make
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,6 +29,7 @@ Source: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2
|
||||
Source1: http://ftp.gnu.org/gnu/make/make-%version.tar.bz2.sig
|
||||
# keyring downloaded from http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=make
|
||||
Source2: %name.keyring
|
||||
Patch1: make-testcases_timeout.diff
|
||||
Patch64: make-library-search-path.diff
|
||||
#BuildRequires: gpg-offline
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
@ -38,6 +39,7 @@ The GNU make command with extensive documentation.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p0
|
||||
if [ %_lib == lib64 ]; then
|
||||
%patch64
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user