commit:     34f74cb47c8be9aab1548c5c1391f79f2761a20e
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 16:04:17 2017 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 16:06:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f74cb4

sci-electronics/pcb: Fix testsuite.

Do not count skipped tests as failed.
Closes: https://bugs.gentoo.org/642366
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-electronics/pcb/files/pcb-4.0.2-tests.diff | 14 ++++++++++++++
 sci-electronics/pcb/pcb-4.0.2.ebuild           |  2 ++
 2 files changed, 16 insertions(+)

diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff 
b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
new file mode 100644
index 00000000000..9c6052ee7d7
--- /dev/null
+++ b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
@@ -0,0 +1,14 @@
+# Do not count skipped tests as failed (bug #642366)
+--- tests/run_tests.sh.orig    2017-12-28 16:40:57.657366187 +0100
++++ tests/run_tests.sh 2017-12-28 16:42:57.183392063 +0100
+@@ -842,8 +842,9 @@
+ show_sep
+ echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
+ 
++sum=`expr $skip + $pass`
+ rc=0
+-if test $pass -ne $tot ; then
++if test $sum -ne $tot ; then
+     rc=1
+ fi
+ 

diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild 
b/sci-electronics/pcb/pcb-4.0.2.ebuild
index a55cedbb76d..9c72f3e67b0 100644
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.0.2.ebuild
@@ -77,6 +77,8 @@ src_prepare() {
                if ! use gcode; then
                        sed -i '/^hid_gcode/d' tests/tests.list || die
                fi
+               # fix wrong accounting of skipped and passed tests
+               epatch "${FILESDIR}"/${P}-tests.diff
        fi
 
        # fix bad syntax in Makefile.am and configure.ac before running 
eautoreconf

Reply via email to