Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpdump/
Date: Sat, 09 Sep 2017 09:51:07
Message-Id: 1504950662.600ec7f1e0c5663d0e468c2aeca28201e6ad388a.jer@gentoo
1 commit: 600ec7f1e0c5663d0e468c2aeca28201e6ad388a
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 9 09:50:53 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 9 09:51:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600ec7f1
7
8 net-analyzer/tcpdump: Disable nbns-valgrind test (bug #630394).
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 net-analyzer/tcpdump/tcpdump-4.9.2.ebuild | 10 +++++++++-
13 net-analyzer/tcpdump/tcpdump-9999.ebuild | 10 +++++++++-
14 2 files changed, 18 insertions(+), 2 deletions(-)
15
16 diff --git a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
17 index 14502772d42..519960e19cd 100644
18 --- a/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
19 +++ b/net-analyzer/tcpdump/tcpdump-4.9.2.ebuild
20 @@ -43,6 +43,15 @@ pkg_setup() {
21 fi
22 }
23
24 +src_prepare() {
25 + default
26 +
27 + sed -i -e '/^eapon1/d;' tests/TESTLIST || die
28 +
29 + # bug 630394
30 + sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
31 +}
32 +
33 src_configure() {
34 if use drop-root; then
35 append-cppflags -DHAVE_CAP_NG_H
36 @@ -59,7 +68,6 @@ src_configure() {
37
38 src_test() {
39 if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
40 - sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
41 emake check
42 else
43 ewarn "If you want to run the test suite, make sure you either"
44
45 diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
46 index 6826bbc5e43..0a56c11cfe9 100644
47 --- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
48 +++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
49 @@ -47,6 +47,15 @@ pkg_setup() {
50 fi
51 }
52
53 +src_prepare() {
54 + default
55 +
56 + sed -i -e '/^eapon1/d;' tests/TESTLIST || die
57 +
58 + # bug 630394
59 + sed -i -e '/^nbns-valgrind/d' tests/TESTLIST || die
60 +}
61 +
62 src_configure() {
63 if use drop-root; then
64 append-cppflags -DHAVE_CAP_NG_H
65 @@ -63,7 +72,6 @@ src_configure() {
66
67 src_test() {
68 if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
69 - sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
70 emake check
71 else
72 ewarn "If you want to run the test suite, make sure you either"