svn commit: r820340 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Dns.pm xt/60_perlcritic.t

[mm...@apache.org]

Author: mmartinec
Date: Wed Sep 30 16:37:50 2009
New Revision: 820340

URL: http://svn.apache.org/viewvc?rev=820340&view=rev
Log:
Enable TestingAndDebugging::ProhibitNoStrict test but
allow the use of 'no strict "refs"'

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
    spamassassin/trunk/xt/60_perlcritic.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm?rev=820340&r1=820339&r2=820340&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm Wed Sep 30 16:37:50 2009
@@ -76,13 +76,13 @@
   # loads later (which will happen).  If we do a fork(), we could wind up
   # attempting to load these modules in *every* subprocess.
   #
-  # We turn off strict and warnings, because Net::DNS and Razor both contain
-  # crud that -w complains about (perl 5.6.0).  Not that this seems to work,
-  # mind ;)
-
-  no strict;
-  local ($^W) = 0;
+# # We turn off strict and warnings, because Net::DNS and Razor both contain
+# # crud that -w complains about (perl 5.6.0).  Not that this seems to work,
+# # mind ;)
+# no strict;
+# local ($^W) = 0;
 
+  no warnings;
   eval {
     require Net::DNS;
     require Net::DNS::Resolver;

Modified: spamassassin/trunk/xt/60_perlcritic.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/xt/60_perlcritic.t?rev=820340&r1=820339&r2=820340&view=diff
==============================================================================
--- spamassassin/trunk/xt/60_perlcritic.t (original)
+++ spamassassin/trunk/xt/60_perlcritic.t Wed Sep 30 16:37:50 2009
@@ -29,7 +29,10 @@
 
   severity = 5
   verbose = 10
-  exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen TestingAndDebugging::RequireUseStrict Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval TestingAndDebugging::ProhibitNoStrict InputOutput::ProhibitInteractiveTest 
+  exclude = ValuesAndExpressions::ProhibitLeadingZeros InputOutput::ProhibitBarewordFileHandles InputOutput::ProhibitTwoArgOpen TestingAndDebugging::RequireUseStrict Subroutines::ProhibitExplicitReturnUndef Variables::RequireLexicalLoopIterators Subroutines::ProhibitSubroutinePrototypes BuiltinFunctions::ProhibitStringyEval InputOutput::ProhibitInteractiveTest
+
+  [TestingAndDebugging::ProhibitNoStrict]
+  allow = refs
 
 };
 close RC;