| 1 |
commit: 3f9649777c14a331b3f29c0bc77f223656eec5a0 |
| 2 |
Author: Paul Healy <lmiphay <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Oct 2 17:52:58 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 7 21:06:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f964977 |
| 7 |
|
| 8 |
sys-apps/dstat: avoid running network... etc tests |
| 9 |
|
| 10 |
This fixes the test target to only load a restricted |
| 11 |
number of the shipped plugins - network, db, |
| 12 |
virtualisation... etc will fail in different ways |
| 13 |
unless the environment or explicit dependencies are |
| 14 |
met. |
| 15 |
|
| 16 |
Closes: https://bugs.gentoo.org/638728 |
| 17 |
Closes: https://bugs.gentoo.org/656514 |
| 18 |
|
| 19 |
Signed-off-by: Paul Healy <lmiphay <AT> gmail.com> |
| 20 |
Closes: https://github.com/gentoo/gentoo/pull/10046 |
| 21 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 22 |
|
| 23 |
sys-apps/dstat/dstat-0.7.3.ebuild | 2 ++ |
| 24 |
.../dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch | 15 +++++++++++++++ |
| 25 |
2 files changed, 17 insertions(+) |
| 26 |
|
| 27 |
diff --git a/sys-apps/dstat/dstat-0.7.3.ebuild b/sys-apps/dstat/dstat-0.7.3.ebuild |
| 28 |
index cbdd1df1a54..372d70a1fd0 100644 |
| 29 |
--- a/sys-apps/dstat/dstat-0.7.3.ebuild |
| 30 |
+++ b/sys-apps/dstat/dstat-0.7.3.ebuild |
| 31 |
@@ -24,6 +24,8 @@ RDEPEND=" |
| 32 |
)" |
| 33 |
DEPEND="" |
| 34 |
|
| 35 |
+PATCHES=( "${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" ) |
| 36 |
+ |
| 37 |
src_install() { |
| 38 |
emake DESTDIR="${ED}" install |
| 39 |
einstalldocs |
| 40 |
|
| 41 |
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 |
| 42 |
new file mode 100644 |
| 43 |
index 00000000000..48eb542ed19 |
| 44 |
--- /dev/null |
| 45 |
+++ b/sys-apps/dstat/files/dstat-0.7.3-skip-non-sandbox-tests.patch |
| 46 |
@@ -0,0 +1,15 @@ |
| 47 |
+--- a/Makefile 2016-03-18 13:03:22.000000000 +0000 |
| 48 |
++++ b/Makefile 2018-10-02 11:11:00.344942941 +0100 |
| 49 |
+@@ -32,9 +32,11 @@ |
| 50 |
+ rm -f examples/*.pyc plugins/*.pyc |
| 51 |
+ $(MAKE) -C docs clean |
| 52 |
+ |
| 53 |
++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 |
| 54 |
++ |
| 55 |
+ test: |
| 56 |
+ ./dstat -taf 1 5 |
| 57 |
+- ./dstat -t --all-plugins 1 5 |
| 58 |
++ ./dstat -t $(TEST_PLUGINS) 1 5 |
| 59 |
+ |
| 60 |
+ dist: clean |
| 61 |
+ $(MAKE) -C docs dist |
Archives