[tbb] 04/04: Merge failonbadtests and tally-unit-test-fails.patch

[Steven Capper]

This is an automated email from the git hooks/post-receive script.

capper-guest pushed a commit to branch steve-staging
in repository tbb.

commit 307f747bf3b5562bb051b54fd885197d9e9c1903
Author: Steve Capper <steven.capper at gmail.com>
Date:   Tue Jul 25 19:24:27 2017 +0100

    Merge failonbadtests and tally-unit-test-fails.patch
---
 debian/patches/failonbadtests.patch        | 22 --------------------
 debian/patches/series                      |  1 -
 debian/patches/tally-unit-test-fails.patch | 32 +++++++++++++++++++-----------
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/debian/patches/failonbadtests.patch b/debian/patches/failonbadtests.patch
deleted file mode 100644
index afb5594..0000000
--- a/debian/patches/failonbadtests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fail hard on serious unit test fails
-Author: Steve Capper <steven.capper at gmail.com>
-
-Index: tbb-2017~U7/Makefile
-===================================================================
---- tbb-2017~U7.orig/Makefile
-+++ tbb-2017~U7/Makefile
-@@ -41,10 +41,10 @@ tbbproxy: mkdir
- 	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy
- 
- test: tbb tbbmalloc $(if $(use_proxy),tbbproxy)
--	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
--	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
--	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
--	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
-+	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
-+	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
-+	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
-+	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
- 
- rml: mkdir
- 	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.rml cfg=debug
diff --git a/debian/patches/series b/debian/patches/series
index df28aa6..17ac0bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 adddebug.patch
 fixnonlinux.patch
-failonbadtests.patch
 buildi386.patch
 linuxreleasedetect.patch
 tally-unit-test-fails.patch
diff --git a/debian/patches/tally-unit-test-fails.patch b/debian/patches/tally-unit-test-fails.patch
index 3645ca5..b02f8e6 100644
--- a/debian/patches/tally-unit-test-fails.patch
+++ b/debian/patches/tally-unit-test-fails.patch
@@ -1,10 +1,10 @@
 Description: tally up passes/fails rather than stop on fail
 Author: Steve Capper <steven.capper at gmail.com>
 
-Index: tbb-4.3~20150611/build/Makefile.test
+Index: tbb/build/Makefile.test
 ===================================================================
---- tbb-4.3~20150611.orig/build/Makefile.test
-+++ tbb-4.3~20150611/build/Makefile.test
+--- tbb.orig/build/Makefile.test
++++ tbb/build/Makefile.test
 @@ -23,6 +23,7 @@
  
  default: test_tbb_plain test_tbb_openmp test_tbb_cilk test_tbb_old
@@ -13,10 +13,10 @@ Index: tbb-4.3~20150611/build/Makefile.test
  tbb_root ?= $(TBBROOT)
  BUILDING_PHASE=1
  TEST_RESOURCE = $(TBB.RES)
-Index: tbb-4.3~20150611/build/test_summary.sh
+Index: tbb/build/test_summary.sh
 ===================================================================
 --- /dev/null
-+++ tbb-4.3~20150611/build/test_summary.sh
++++ tbb/build/test_summary.sh
 @@ -0,0 +1,36 @@
 +#!/bin/sh
 +
@@ -54,14 +54,22 @@ Index: tbb-4.3~20150611/build/test_summary.sh
 +fi
 +
 +exit 0 # always succeed
-Index: tbb-4.3~20150611/Makefile
+Index: tbb/Makefile
 ===================================================================
---- tbb-4.3~20150611.orig/Makefile
-+++ tbb-4.3~20150611/Makefile
-@@ -45,6 +45,8 @@ test: tbb tbbmalloc $(if $(use_proxy),tb
- 	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
- 	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
- 	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
+--- tbb.orig/Makefile
++++ tbb/Makefile
+@@ -41,10 +41,12 @@ tbbproxy: mkdir
+ 	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbproxy cfg=release tbbproxy
+ 
+ test: tbb tbbmalloc $(if $(use_proxy),tbbproxy)
+-	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
+-	-$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
+-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
+-	-$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
++	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=debug malloc_test
++	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.test cfg=debug
++	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.tbbmalloc cfg=release malloc_test
++	$(MAKE) -C "$(work_dir)_release"  -r -f $(tbb_root)/build/Makefile.test cfg=release
 +	sh ./build/test_summary.sh --dump DEBUG "$(work_dir)_debug"
 +	sh ./build/test_summary.sh --dump RELEASE "$(work_dir)_release"
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tbb.git