From 3f9649777c14a331b3f29c0bc77f223656eec5a0 Mon Sep 17 00:00:00 2001 From: Paul Healy Date: Tue, 2 Oct 2018 18:52:58 +0100 Subject: [PATCH] sys-apps/dstat: avoid running network... etc tests This fixes the test target to only load a restricted number of the shipped plugins - network, db, virtualisation... etc will fail in different ways unless the environment or explicit dependencies are met. Closes: https://bugs.gentoo.org/638728 Closes: https://bugs.gentoo.org/656514 Signed-off-by: Paul Healy Closes: https://github.com/gentoo/gentoo/pull/10046 Signed-off-by: Andreas Sturmlechner --- sys-apps/dstat/dstat-0.7.3.ebuild | 2 ++ .../dstat-0.7.3-skip-non-sandbox-tests.patch | 15 +++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild index cbdd1df1a54c1..372d70a1fd0a6 100644 --- a/sys-apps/dstat/dstat-0.7.3.ebuild +++ b/sys-apps/dstat/dstat-0.7.3.ebuild @@ -24,6 +24,8 @@ RDEPEND=" )" DEPEND="" +PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" ) + src_install() { emake DESTDIR="${ED}" install einstalldocs diff --git a/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch new file mode 100644 index 0000000000000..48eb542ed1953 --- /dev/null +++ b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch @@ -0,0 +1,15 @@ +--- a/Makefile 2016-03-18 13:03:22.000000000 +0000 ++++ b/Makefile 2018-10-02 11:11:00.344942941 +0100 +@@ -32,9 +32,11 @@ + rm -f examples/*.pyc plugins/*.pyc + $(MAKE) -C docs clean + ++TEST_PLUGINS=--cpufreq --disk-avgqu --disk-avgrq --disk-svctm --disk-tps --disk-util --disk-wait --dstat-cpu --dstat-ctxt --dstat-mem --dstat --helloworld --md-status --net-packets --proc-count --snooze --test --top-bio-adv --top-bio --top-childwait --top-cpu-adv --top-cpu --top-cputime-avg --top-cputime --top-int --top-io-adv --top-io --top-latency-avg --top-latency --top-mem --top-oom ++ + test: + ./dstat -taf 1 5 +- ./dstat -t --all-plugins 1 5 ++ ./dstat -t $(TEST_PLUGINS) 1 5 + + dist: clean + $(MAKE) -C docs dist