Remove stack traces from common error messages

diff --git a/lib/Test/Valgrind.pm b/lib/Test/Valgrind.pm
index 5c1c8bb1a4553b79203ffad0c526c76a77063347..1e563a813bbe61258afb2629c689e21e3639d00a 100644 (file)
--- a/lib/Test/Valgrind.pm
+++ b/lib/Test/Valgrind.pm
@@ -168,7 +168,9 @@ sub analyse {
   );
  };
  unless ($sess) {
-  $action->abort($sess, $@);
+  my $err = $@;
+  $err =~ s/^(Empty valgrind candidates list|No appropriate valgrind executable could be found)\s+at.*/$1/;
+  $action->abort($sess, $err);
   return $action->status($sess);
  }
 

diff --git a/t/80-suppressions.t b/t/80-suppressions.t
index b6f22c7d6b1dfcb61b4e178fe0b1d773d90daa5e..bb93875bf15dd7467aeef3714775158c9737f082 100644 (file)
--- a/t/80-suppressions.t
+++ b/t/80-suppressions.t
@@ -22,8 +22,9 @@ my $sess = eval { Test::Valgrind::Session->new(
  min_version => $tool->requires_version,
 ) };
 
-if ($@) {
- plan skip_all => $@;
+if (my $err = $@) {
+ $err =~ s/^(Empty valgrind candidates list|No appropriate valgrind executable could be found)\s+at.*/$1/;
+ plan skip_all => $err;
 } else {
  plan tests => 4;
 }