git commit: refs/heads/master - Fix valgrind tests with Debian's debugperl

[nw...@apache.org]

Repository: lucy
Updated Branches:
  refs/heads/master e45295bbf -> 83c98ee6a


Fix valgrind tests with Debian's debugperl

With Debian's debugperl, the test for -DDEBUGGING fails, so make an
exception. See Debian bug #332629.


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/83c98ee6
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/83c98ee6
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/83c98ee6

Branch: refs/heads/master
Commit: 83c98ee6a98db546e63efe17f823f2627d29cd56
Parents: e45295b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Mon Jul 28 14:52:12 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Mon Jul 28 14:52:12 2014 +0200

----------------------------------------------------------------------
 perl/buildlib/Lucy/Build.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/83c98ee6/perl/buildlib/Lucy/Build.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build.pm b/perl/buildlib/Lucy/Build.pm
index 973c1f3..9dd62c0 100644
--- a/perl/buildlib/Lucy/Build.pm
+++ b/perl/buildlib/Lucy/Build.pm
@@ -132,8 +132,11 @@ sub _valgrind_base_command {
 #   $ ./Build test_valgrind --suppressions=foo.supp,bar.supp
 sub ACTION_test_valgrind {
     my $self = shift;
+    # Debian's debugperl uses the Config.pm of the standard system perl
+    # so -DDEBUGGING won't be detected.
     die "Must be run under a perl that was compiled with -DDEBUGGING"
-        unless $self->config('ccflags') =~ /-D?DEBUGGING\b/;
+        unless $self->config('ccflags') =~ /-D?DEBUGGING\b/
+               || $^X =~ /\bdebugperl\b/;
     if ( !$ENV{LUCY_VALGRIND} ) {
         warn "\$ENV{LUCY_VALGRIND} not true -- possible false positives";
     }