Skip to content

Commit

Permalink
sys-apps/dstat: avoid running network... etc tests
Browse files Browse the repository at this point in the history
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 <[email protected]>
Closes: gentoo#10046
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
lmiphay authored and a17r committed Oct 7, 2018
1 parent 1b5fc46 commit 3f96497
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 0 deletions.
2 changes: 2 additions & 0 deletions sys-apps/dstat/dstat-0.7.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ RDEPEND="
)"
DEPEND=""

PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" )

src_install() {
emake DESTDIR="${ED}" install
einstalldocs
Expand Down
15 changes: 15 additions & 0 deletions sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 3f96497

Please sign in to comment.