media-sound/xmms2/files/xmms2-0.8-rtvg.patch

   1 Add knob to disable valgrind at test runtime.
   2
   3 When valgrind is installed in system but is not
   4 working we should still be able to run tests.
   5
   6 Reported-by: Diego Elio Pettenò
   7 Bug: https://bugs.gentoo.org/424377
   8 diff --git a/waftools/unittest.py b/waftools/unittest.py
   9 index 4317287..6179dfd 100644
  10 --- a/waftools/unittest.py
  11 +++ b/waftools/unittest.py
  12 @@ -64,7 +64,8 @@ def generate_coverage(bld):
  13
  14  def configure(conf):
  15      conf.load("waf_unit_test")
  16 -    conf.find_program("valgrind", var="VALGRIND", mandatory=False)
  17 +    if conf.options.enable_valgrind is True:
  18 +        conf.find_program("valgrind", var="VALGRIND", mandatory=False)
  19      conf.find_program("lcov", var="LCOV", mandatory=False)
  20      conf.find_program("genhtml", var="GENHTML", mandatory=False)
  21
  22 diff --git a/wscript b/wscript
  23 index 99c1fa3..a98d5e3 100644
  24 --- a/wscript
  25 +++ b/wscript
  26 @@ -501,6 +501,10 @@ def options(opt):
  27                     dest='ldconfig', help="Run ldconfig after install even if not root")
  28      opt.add_option('--without-ldconfig', action='store_false',
  29                     dest='ldconfig', help="Don't run ldconfig after install")
  30 +    opt.add_option('--with-valgrind', action='store_true', default=None,
  31 +                   dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
  32 +    opt.add_option('--without-valgrind', action='store_false', default=None,
  33 +                   dest='enable_valgrind', help="Don't run testsuite under valgrind.")
  34
  35      opt.sub_options("src/xmms")
  36      for o in optional_subdirs + subdirs: