[tbb] 54/64: Imported Debian patch 4.2~20140122-3

[Graham Inggs]

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

ginggs pushed a commit to branch master
in repository tbb.

commit e7f1d30c0d39eedbce335bb2d3214a9364d406f9
Author: Steve Capper <steven.capper at gmail.com>
Date:   Fri Sep 19 20:35:24 2014 +0100

    Imported Debian patch 4.2~20140122-3
---
 debian/changelog                           | 10 +++++
 debian/patches/series                      |  1 +
 debian/patches/tally-unit-test-fails.patch | 64 ++++++++++++++++++++++++++++++
 debian/rules                               |  6 +--
 debian/tbb.pc                              | 11 -----
 5 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb8a46b..6b643ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tbb (4.2~20140122-3) unstable; urgency=medium
+
+  * Unit test execution failures no longer cause build to fail; instead take a
+    tally of passes/failures to make it easier to analyse which cases are prone
+    to failure.
+    + debian/patches/tally-unit-test-fails.patch
+  * debian/rules modified s.t. the unit tests are no longer executed twice
+
+ -- Steve Capper <steven.capper at gmail.com>  Fri, 19 Sep 2014 20:35:24 +0100
+
 tbb (4.2~20140122-2) unstable; urgency=medium
 
   * Unit test compile errors no longer ignored. Closes: #752820
diff --git a/debian/patches/series b/debian/patches/series
index 7d6be14..816aeef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ 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
new file mode 100644
index 0000000..ba238da
--- /dev/null
+++ b/debian/patches/tally-unit-test-fails.patch
@@ -0,0 +1,64 @@
+Description: tally up passes/fails rather than stop on fail
+Author: Steve Capper <steven.capper at gmail.com>
+
+Index: tbb/build/Makefile.test
+===================================================================
+--- tbb.orig/build/Makefile.test
++++ tbb/build/Makefile.test
+@@ -31,6 +31,7 @@
+ 
+ default: test_tbb_plain test_tbb_openmp test_tbb_cilk test_tbb_old
+ 
++run_cmd = sh ../test_summary.sh
+ tbb_root ?= $(TBBROOT)
+ BUILDING_PHASE=1
+ TEST_RESOURCE = $(TBB.RES)
+Index: tbb/build/test_summary.sh
+===================================================================
+--- /dev/null
++++ tbb/build/test_summary.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++
++# Rather than fail on first test, we keep a tally of tests that
++# pass/fail; as some are running unpredictably on some systems.
++
++# We do fail if we can't compile a test.
++
++if [ "$1" = "--dump" ]; then
++    if [ -e "$3/tests.passed" ]; then
++        count=$(wc -l "$3/tests.passed" | awk '{print $1}')
++        echo $count $2 tests passed.
++    fi
++
++    if [ -e "$3/tests.failed" ]; then
++        echo The following $2 tests FAILED!
++        cat "$3/tests.failed"
++    fi
++
++    exit 0
++fi
++
++eval $@
++rc=$?
++
++if [ "$rc" -eq "0" ]; then
++    echo "$@" >> tests.passed
++else
++    echo "$@" >> tests.failed
++fi
++
++exit 0 # always succeed
+Index: tbb/Makefile
+===================================================================
+--- tbb.orig/Makefile
++++ tbb/Makefile
+@@ -53,6 +53,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
++	sh ./build/test_summary.sh --dump DEBUG "$(work_dir)_debug"
++	sh ./build/test_summary.sh --dump RELEASE "$(work_dir)_release"
+ 
+ rml: mkdir
+ 	$(MAKE) -C "$(work_dir)_debug"  -r -f $(tbb_root)/build/Makefile.rml cfg=debug
diff --git a/debian/rules b/debian/rules
index 0e0296c..b377cad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,10 +12,10 @@ CXXFLAGS+=$(CPPFLAGS)
 	dh $@ --parallel --dbg-package=libtbb2-dbg
 
 VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d-)
-debian/tbb.pc: debian/tbb.pc.in
-	sed -e"s/@VERSION@/$(VERSION)/g" $< > $@
 
-build-arch: debian/tbb.pc
+override_dh_auto_build:
+			sed -e"s/@VERSION@/$(VERSION)/g" debian/tbb.pc.in > debian/tbb.pc
+			dh_auto_build
 
 # Makefiles should not be compressed (tbb-examples)
 override_dh_compress-indep:
diff --git a/debian/tbb.pc b/debian/tbb.pc
deleted file mode 100644
index f0b79eb..0000000
--- a/debian/tbb.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Threading Building Blocks
-Description: Intel's parallelism library for C++
-URL: http://www.threadingbuildingblocks.org/
-Version: 4.2~20140122
-Libs: -L${libdir} -ltbb
-Cflags: -I${includedir} 

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