You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by si...@apache.org on 2023/11/21 04:10:39 UTC

svn commit: r1913997 - in /spamassassin/trunk: Makefile.PL lib/Mail/SpamAssassin/Util/DependencyInfo.pm

Author: sidney
Date: Tue Nov 21 04:10:39 2023
New Revision: 1913997

URL: http://svn.apache.org/viewvc?rev=1913997&view=rev
Log:
bug 8195 Specify Text::Diff and Devel::Cycle as optional modules instead of required

Modified:
    spamassassin/trunk/Makefile.PL
    spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1913997&r1=1913996&r2=1913997&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Tue Nov 21 04:10:39 2023
@@ -200,9 +200,7 @@ my %makefile = (
 
     # The modules that are not core or that require a minimum version that are used in default tests
     'TEST_REQUIRES' => {
-        'Devel::Cycle' => 0,
         'Test::Simple' => 1.302067,
-        'Text::Diff' => 0,
         'Perl::Critic::Policy::TestingAndDebugging::ProhibitNoStrict' => 0,
         'Perl::Critic::Policy::Perlsecret' => 0,
     },
@@ -396,6 +394,8 @@ $makefile{META_MERGE} = {
         'IO::String' =>                0,
         'Email::Address::XS' =>        0,
         'Mail::DMARC' =>               0,
+        'Devel::Cycle' =>              0,
+        'Text::Diff' =>                0,
       },
     },
     test => {

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1913997&r1=1913996&r2=1913997&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Tue Nov 21 04:10:39 2023
@@ -323,6 +323,18 @@ our @OPTIONAL_MODULES = (
   version => 0,
   desc => 'Mail::DMARC is used by the optional DMARC plugin.',
 },
+{
+  module => 'Devel::Cycle',
+  version => 0,
+  desc => 'Devel::Cycle is used in make test in tests that will be harmelessly
+  skipped if it is not available',
+},
+{
+  module => 'Text::Diff',
+  version => 0,
+  desc => 'Text::Diff is used in make test in tests that will be harmelessly
+  skipped if it is not available',
+},
 );
 
 our @BINARIES = ();