You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/06/21 08:23:02 UTC
svn commit: r1861758 - in /spamassassin: branches/3.4/t/make_install.t
branches/3.4/t/sa_compile.t trunk/t/make_install.t trunk/t/sa_compile.t
Author: hege
Date: Fri Jun 21 08:23:02 2019
New Revision: 1861758
URL: http://svn.apache.org/viewvc?rev=1861758&view=rev
Log:
Some trivial fixes, always latest tardist file, reset sa-compile cache
Modified:
spamassassin/branches/3.4/t/make_install.t
spamassassin/branches/3.4/t/sa_compile.t
spamassassin/trunk/t/make_install.t
spamassassin/trunk/t/sa_compile.t
Modified: spamassassin/branches/3.4/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/make_install.t?rev=1861758&r1=1861757&r2=1861758&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/make_install.t (original)
+++ spamassassin/branches/3.4/t/make_install.t Fri Jun 21 08:23:02 2019
@@ -30,8 +30,11 @@ system("rm -rf $instbase $builddir");
system("mkdir -p $instbase $builddir");
sub system_or_die;
-system_or_die "cd .. && make tardist";
-system_or_die "cd $builddir && gunzip -cd $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf -";
+my $tardist = `cd .. && make tardist 2>&1`;
+$? == 0 or die "tardist failed: $?";
+$tardist =~ /^Created (Mail-SpamAssassin-[\d.]+\.tar\.gz)$/m or die "tardist parse failed: $tardist";
+my $tarfile = $1;
+system_or_die "cd $builddir && gunzip -cd $cwd/../$tarfile | tar xf -";
system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
# Figure out where 'bin' really is
Modified: spamassassin/branches/3.4/t/sa_compile.t
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/t/sa_compile.t?rev=1861758&r1=1861757&r2=1861758&view=diff
==============================================================================
--- spamassassin/branches/3.4/t/sa_compile.t (original)
+++ spamassassin/branches/3.4/t/sa_compile.t Fri Jun 21 08:23:02 2019
@@ -39,10 +39,13 @@ my $instbase = "$cwd/log/d.$testname/ins
print "\nMaking tar dist file and then untarring it.\n";
-system_or_die "cd .. && make tardist 2>&1 > /dev/null";
+my $tardist = `cd .. && make tardist 2>&1`;
+$? == 0 or die "tardist failed: $?";
+$tardist =~ /^Created (Mail-SpamAssassin-[\d.]+\.tar\.gz)$/m or die "tardist parse failed: $tardist";
+my $tarfile = $1;
system("rm -rf $builddir");
system("mkdir -p $builddir");
-system_or_die "cd $builddir && gunzip -c $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf - ";
+system_or_die "cd $builddir && gunzip -c $cwd/../$tarfile | tar xf - ";
system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
&new_instdir("basic");
@@ -73,6 +76,7 @@ clear_pattern_counters();
# -------------------------------------------------------------------
print "\nRunning spam checks compiled\n";
+system "rm -rf \$HOME/.spamassassin/sa-compile.cache"; # reset test
system_or_die "$instdir/$temp_binpath/sa-compile --keep-tmps 2>&1"; # --debug
%patterns = (
@@ -88,6 +92,11 @@ ok_all_patterns();
# -------------------------------------------------------------------
+# Cleanup after testing (todo, sa-compile should have option for userstatedir)
+system "rm -rf \$HOME/.spamassassin/sa-compile.cache";
+
+# -------------------------------------------------------------------
+
sub re2c_version_new_enough {
#check if re2c exiss and if it is 0.12.0 or greater
Modified: spamassassin/trunk/t/make_install.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/make_install.t?rev=1861758&r1=1861757&r2=1861758&view=diff
==============================================================================
--- spamassassin/trunk/t/make_install.t (original)
+++ spamassassin/trunk/t/make_install.t Fri Jun 21 08:23:02 2019
@@ -30,8 +30,11 @@ system("rm -rf $instbase $builddir");
system("mkdir -p $instbase $builddir");
sub system_or_die;
-system_or_die "cd .. && make tardist";
-system_or_die "cd $builddir && gunzip -cd $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf -";
+my $tardist = `cd .. && make tardist 2>&1`;
+$? == 0 or die "tardist failed: $?";
+$tardist =~ /^Created (Mail-SpamAssassin-[\d.]+\.tar\.gz)$/m or die "tardist parse failed: $tardist";
+my $tarfile = $1;
+system_or_die "cd $builddir && gunzip -cd $cwd/../$tarfile | tar xf -";
system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
# Figure out where 'bin' really is
Modified: spamassassin/trunk/t/sa_compile.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/sa_compile.t?rev=1861758&r1=1861757&r2=1861758&view=diff
==============================================================================
--- spamassassin/trunk/t/sa_compile.t (original)
+++ spamassassin/trunk/t/sa_compile.t Fri Jun 21 08:23:02 2019
@@ -39,10 +39,13 @@ my $instbase = "$cwd/log/d.$testname/ins
print "\nMaking tar dist file and then untarring it.\n";
-system_or_die "cd .. && make tardist 2>&1 > /dev/null";
+my $tardist = `cd .. && make tardist 2>&1`;
+$? == 0 or die "tardist failed: $?";
+$tardist =~ /^Created (Mail-SpamAssassin-[\d.]+\.tar\.gz)$/m or die "tardist parse failed: $tardist";
+my $tarfile = $1;
system("rm -rf $builddir");
system("mkdir -p $builddir");
-system_or_die "cd $builddir && gunzip -c $cwd/../Mail-SpamAssassin-*.tar.gz | tar xf - ";
+system_or_die "cd $builddir && gunzip -c $cwd/../$tarfile | tar xf - ";
system_or_die "cd $builddir && mv Mail-SpamAssassin-* x";
&new_instdir("basic");
@@ -73,6 +76,7 @@ clear_pattern_counters();
# -------------------------------------------------------------------
print "\nRunning spam checks compiled\n";
+system "rm -rf \$HOME/.spamassassin/sa-compile.cache"; # reset test
system_or_die "$instdir/$temp_binpath/sa-compile --keep-tmps 2>&1"; # --debug
%patterns = (
@@ -88,6 +92,11 @@ ok_all_patterns();
# -------------------------------------------------------------------
+# Cleanup after testing (todo, sa-compile should have option for userstatedir)
+system "rm -rf \$HOME/.spamassassin/sa-compile.cache";
+
+# -------------------------------------------------------------------
+
sub re2c_version_new_enough {
#check if re2c exiss and if it is 0.12.0 or greater