Merge branch 'no-closure'

[public-inbox.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index c4495c4f9325bac163ad902ef8206a3d723bf827..0f50a65852ac6b083a3ca3a8a2f4472372433877 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -22,6 +22,7 @@ my @syn = (@EXE_FILES, grep(m!^lib/.*\.pm$!, @manifest), @scripts);
 @syn = grep(!/DSKQXS\.pm/, @syn) if !eval { require IO::KQueue };
 @syn = grep(!/Unsubscribe\.pm/, @syn) if !eval { require Crypt::CBC };
 @syn = grep(!/SaPlugin/, @syn) if !eval { require Mail::SpamAssasin };
+$v->{syn_files} = \@syn;
 $v->{my_syntax} = [map { "$_.syntax" } @syn];
 $v->{-m1} = [ map { (split('/'))[-1] } @EXE_FILES ];
 $v->{-m5} = [ qw(public-inbox-config public-inbox-v1-format
@@ -83,12 +84,12 @@ my $TGTS = join("\n", map {;
        my $tgt_prereq = $_;
        my $cmds = $t->{$_};
        "$tgt_prereq\n".join('', map { "\t$_\n" } @$cmds);
-} keys %$t);
+} sort keys %$t);
 
 my $VARS = join("\n", map {;
        my $varname = $_;
-       join('', map { "$varname += $_\n" } @{$v->{$varname}});
-} grep(!/^-/, keys %$v));
+       join('', map { "$varname += $_\n" } sort @{$v->{$varname}});
+} grep(!/^-/, sort keys %$v));
 
 # Don't waste user's disk space by installing some pods from
 # imported code or internal use only
@@ -110,7 +111,6 @@ WriteMakefile(
                # note: we use spamc(1), NOT the Perl modules
                # We also depend on git.
                # Keep this sorted and synced to the INSTALL document
-               'Date::Parse' => 0,
 
                # libperl$PERL_VERSION,
                # `perl5' on FreeBSD
@@ -146,6 +146,7 @@ WriteMakefile(
 
 sub MY::postamble {
   <<EOF;
+PROVE = prove
 # support using eatmydata to speed up tests (apt-get install eatmydata):
 # https://www.flamingspork.com/projects/libeatmydata/
 EATMYDATA =
@@ -167,8 +168,16 @@ dsyn :: \$(addsuffix .syntax, \$(filter \$(changed), \$(syn_files)))
 check-manifest :: MANIFEST
        if git ls-files >\$?.gen 2>&1; then diff -u \$? \$?.gen; fi
 
-check:: pure_all check-manifest
-       \$(EATMYDATA) prove -bvw -j\$(N)
+# the traditional way running per-*.t processes:
+check-each :: pure_all check-manifest
+       \$(EATMYDATA) \$(PROVE) --state=save -bvw -j\$(N)
+
+# lightly-tested way to runn tests, relies "--state=save" in check-each
+# for best performance
+check-run :: pure_all check-manifest
+       \$(EATMYDATA) \$(PROVE) -bvw t/run.perl :: -j\$(N)
+
+check :: check-each
 
 lib/PublicInbox/UserContent.pm :: contrib/css/216dark.css
        \$(PERL) -I lib \$@ \$?