From dcd20ec8d9a198a55285420b5cb13faed02c3e04 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 26 Oct 2007 22:34:46 +0000
Subject: [PATCH] fix for Devel::Cover warnings that clutter up the smoke test
 report.  Also, fix the --help switch to testCodebase.pl

---
 docs/changelog/7.x.x.txt | 1 +
 sbin/testCodebase.pl     | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 778034c18..b1628e83a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -14,6 +14,7 @@
  - safely allow sorting by more fields in collaboration systems
  - fix: iCal link on calendar doesn't work
  - fix: error when deleting profile fields with non-alphanumeric names
+ - fix: Devel::Cover tests don't work (perlDreamer Consulting, LLC.)
 
 7.4.10
  - fix: Graphs aren't sized properly using GraphicsMagick
diff --git a/sbin/testCodebase.pl b/sbin/testCodebase.pl
index 4a7c4feff..498218ef4 100644
--- a/sbin/testCodebase.pl
+++ b/sbin/testCodebase.pl
@@ -54,6 +54,11 @@ my $helpmsg=<<STOP;
 
 STOP
 
+if ($help) {
+    print $helpmsg;
+    die "\n";
+}
+
 my $verboseFlag = "-v" if ($verbose);
 
 $perlBase .= '/bin/' if ($perlBase);
@@ -76,7 +81,7 @@ my $prefix = "WEBGUI_CONFIG=".$configFile;
 $prefix .= " CODE_COP=1" unless $noLongTests;
 
 # Add coverage tests
-$prefix .= " PERL5OPT='-MDevel::Cover=-db,/tmp/coverdb'" if $coverage;
+$prefix .= " HARNESS_PERL_SWITCHES='-MDevel::Cover=-db,/tmp/coverdb'" if $coverage;
 
 print(join ' ', $prefix, $perlBase."prove", $verboseFlag, '-r ../t'); print "\n";
 system(join ' ', $prefix, $perlBase."prove", $verboseFlag, '-r ../t');