| 1 |
commit: 34f74cb47c8be9aab1548c5c1391f79f2761a20e |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 28 16:04:17 2017 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 28 16:06:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f74cb4 |
| 7 |
|
| 8 |
sci-electronics/pcb: Fix testsuite. |
| 9 |
|
| 10 |
Do not count skipped tests as failed. |
| 11 |
Closes: https://bugs.gentoo.org/642366 |
| 12 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 13 |
|
| 14 |
sci-electronics/pcb/files/pcb-4.0.2-tests.diff | 14 ++++++++++++++ |
| 15 |
sci-electronics/pcb/pcb-4.0.2.ebuild | 2 ++ |
| 16 |
2 files changed, 16 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..9c6052ee7d7 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff |
| 23 |
@@ -0,0 +1,14 @@ |
| 24 |
+# Do not count skipped tests as failed (bug #642366) |
| 25 |
+--- tests/run_tests.sh.orig 2017-12-28 16:40:57.657366187 +0100 |
| 26 |
++++ tests/run_tests.sh 2017-12-28 16:42:57.183392063 +0100 |
| 27 |
+@@ -842,8 +842,9 @@ |
| 28 |
+ show_sep |
| 29 |
+ echo "Passed $pass, failed $fail, skipped $skip out of $tot tests." |
| 30 |
+ |
| 31 |
++sum=`expr $skip + $pass` |
| 32 |
+ rc=0 |
| 33 |
+-if test $pass -ne $tot ; then |
| 34 |
++if test $sum -ne $tot ; then |
| 35 |
+ rc=1 |
| 36 |
+ fi |
| 37 |
+ |
| 38 |
|
| 39 |
diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild |
| 40 |
index a55cedbb76d..9c72f3e67b0 100644 |
| 41 |
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild |
| 42 |
+++ b/sci-electronics/pcb/pcb-4.0.2.ebuild |
| 43 |
@@ -77,6 +77,8 @@ src_prepare() { |
| 44 |
if ! use gcode; then |
| 45 |
sed -i '/^hid_gcode/d' tests/tests.list || die |
| 46 |
fi |
| 47 |
+ # fix wrong accounting of skipped and passed tests |
| 48 |
+ epatch "${FILESDIR}"/${P}-tests.diff |
| 49 |
fi |
| 50 |
|
| 51 |
# fix bad syntax in Makefile.am and configure.ac before running eautoreconf |
Archives