From 40205a44c3f0f8ae0c81bd9e75fa1f4d405f8a1f5f4e3a8f9367996e6ada4cba Mon Sep 17 00:00:00 2001
From: Matthias Hopf <matthias@hopf.in>
Date: Mon, 30 Aug 2010 17:41:35 +0000
Subject: [PATCH] - Disable some inherrently broken test cases.

OBS-URL: https://build.opensuse.org/package/show/Base:System/make?expand=0&rev=11
---
 make-disable-broken-tests.diff | 141 +++++++++++++++++++++++++++++++++
 make.changes                   |   5 ++
 make.spec                      |   2 +
 3 files changed, 148 insertions(+)
 create mode 100644 make-disable-broken-tests.diff

diff --git a/make-disable-broken-tests.diff b/make-disable-broken-tests.diff
new file mode 100644
index 0000000..1a9f357
--- /dev/null
+++ b/make-disable-broken-tests.diff
@@ -0,0 +1,141 @@
+Index: make-3.82/tests/scripts/targets/SECONDARY
+===================================================================
+--- make-3.82.orig/tests/scripts/targets/SECONDARY
++++ make-3.82/tests/scripts/targets/SECONDARY
+@@ -121,69 +121,73 @@ all: version2',
+ 
+ unlink('version2');
+ 
+-# TEST #9 -- Savannah bug #15919
+-# The original fix for this bug caused a new bug, shown here.
+-
+-touch(qw(1.a 2.a));
+-
+-run_make_test('
+-%.c : %.b ; cp $< $@
+-%.b : %.a ; cp $< $@
+-all : 1.c 2.c', '-rR -j',
+-'cp 1.a 1.b
+-cp 2.a 2.b
+-cp 1.b 1.c
+-cp 2.b 2.c
+-rm 1.b 2.b');
+-
+-unlink(qw(1.a 2.a 1.c 2.c));
+-
+-# TEST #10 -- Savannah bug #15919
+-touch('test.0');
+-run_make_test('
+-.SECONDARY : test.1 test.2 test.3
+-
+-test : test.4
+-
+-%.4 : %.int %.3 ; touch $@
+-
+-%.int : %.3 %.2 ; touch $@
+-
+-%.3 : | %.2 ; touch $@
+-
+-%.2 : %.1 ; touch $@
+-
+-%.1 : %.0 ; touch $@', '-rR -j 2',
+-'touch test.1
+-touch test.2
+-touch test.3
+-touch test.int
+-touch test.4
+-rm test.int');
+-
+-# After a touch of test.0 it should give the same output, except we don't need
+-# to rebuild test.3 (order-only)
+-sleep(1);
+-touch('test.0');
+-run_make_test(undef, '-rR -j 2',
+-'touch test.1
+-touch test.2
+-touch test.int
+-touch test.4
+-rm test.int');
+-
+-# With both test.0 and test.3 updated it should still build everything except
+-# test.3
+-sleep(1);
+-touch('test.0', 'test.3');
+-run_make_test(undef, '-rR -j 2',
+-'touch test.1
+-touch test.2
+-touch test.int
+-touch test.4
+-rm test.int');
+-
+-unlink(qw(test.0 test.1 test.2 test.3 test.4));
++# All these tests don't reliably work under high load conditions.
++# Heck, I had two different failures on my workstation, and it's
++# perfectly clear that ordering can differ. - mhopf
++
++# # TEST #9 -- Savannah bug #15919
++# # The original fix for this bug caused a new bug, shown here.
++# 
++# touch(qw(1.a 2.a));
++# 
++# run_make_test('
++# %.c : %.b ; cp $< $@
++# %.b : %.a ; cp $< $@
++# all : 1.c 2.c', '-rR -j',
++# 'cp 1.a 1.b
++# cp 2.a 2.b
++# cp 1.b 1.c
++# cp 2.b 2.c
++# rm 1.b 2.b');
++# 
++# unlink(qw(1.a 2.a 1.c 2.c));
++# 
++# # TEST #10 -- Savannah bug #15919
++# touch('test.0');
++# run_make_test('
++# .SECONDARY : test.1 test.2 test.3
++# 
++# test : test.4
++# 
++# %.4 : %.int %.3 ; touch $@
++# 
++# %.int : %.3 %.2 ; touch $@
++# 
++# %.3 : | %.2 ; touch $@
++# 
++# %.2 : %.1 ; touch $@
++# 
++# %.1 : %.0 ; touch $@', '-rR -j 2',
++# 'touch test.1
++# touch test.2
++# touch test.3
++# touch test.int
++# touch test.4
++# rm test.int');
++# 
++# # After a touch of test.0 it should give the same output, except we don't need
++# # to rebuild test.3 (order-only)
++# sleep(1);
++# touch('test.0');
++# run_make_test(undef, '-rR -j 2',
++# 'touch test.1
++# touch test.2
++# touch test.int
++# touch test.4
++# rm test.int');
++# 
++# # With both test.0 and test.3 updated it should still build everything except
++# # test.3
++# sleep(1);
++# touch('test.0', 'test.3');
++# run_make_test(undef, '-rR -j 2',
++# 'touch test.1
++# touch test.2
++# touch test.int
++# touch test.4
++# rm test.int');
++# 
++# unlink(qw(test.0 test.1 test.2 test.3 test.4));
+ 
+ # This tells the test driver that the perl test script executed properly.
+ 1;
diff --git a/make.changes b/make.changes
index 162fb7c..e0e373d 100644
--- a/make.changes
+++ b/make.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Aug 30 17:37:23 UTC 2010 - mhopf@novell.com
+
+- Disable some inherrently broken test cases.
+
 -------------------------------------------------------------------
 Mon Aug 23 13:39:12 UTC 2010 - mhopf@novell.com
 
diff --git a/make.spec b/make.spec
index e3f9cb5..99973fd 100644
--- a/make.spec
+++ b/make.spec
@@ -30,6 +30,7 @@ Release:        131
 Summary:        GNU make
 Source:         make-%version.tar.bz2
 Patch2:         make-slowdown-parallelism.diff
+Patch3:		make-disable-broken-tests.diff
 Patch64:        make-library-search-path.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -39,6 +40,7 @@ The GNU make command with extensive documentation.
 %prep
 %setup
 %patch2
+%patch3 -p1
 if [ %_lib == lib64 ]; then
 %patch64
 fi