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 2020/01/27 12:21:46 UTC
svn commit: r1873205 - /spamassassin/trunk/t/strip2.t
Author: hege
Date: Mon Jan 27 12:21:46 2020
New Revision: 1873205
URL: http://svn.apache.org/viewvc?rev=1873205&view=rev
Log:
Fix strip2.t
Modified:
spamassassin/trunk/t/strip2.t
Modified: spamassassin/trunk/t/strip2.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/strip2.t?rev=1873205&r1=1873204&r2=1873205&view=diff
==============================================================================
--- spamassassin/trunk/t/strip2.t (original)
+++ spamassassin/trunk/t/strip2.t Mon Jan 27 12:21:46 2020
@@ -4,7 +4,7 @@ use lib '.'; use lib 't';
use SATest; sa_t_init("strip2");
use Test::More;
-plan skip_all => 'Long running tests disabled' if conf_bool('run_long_tests');
+plan skip_all => 'Long running tests disabled' unless conf_bool('run_long_tests');
plan tests => 98;
# ---------------------------------------------------------------------------
@@ -48,7 +48,7 @@ foreach $input (@files) {
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -72,7 +72,7 @@ foreach $input (@files) {
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -101,7 +101,7 @@ ok (-f $d_input);
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
- ok sarun ("-d < $d_input");
+ ok sarun ("-L -d < $d_input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -111,7 +111,7 @@ ok (-f $d_input);
$test_number = test_number();
my $d_output = "log/d.$testname/$test_number";
unlink $d_output;
-ok sarun ("-d < $input");
+ok sarun ("-L -d < $input");
ok (-f $d_output);
ok(!compare_text($input,$d_output))
or diffwarn( $input, $d_output );
@@ -119,8 +119,8 @@ ok(!compare_text($input,$d_output))
sub diffwarn {
my ($f1, $f2) = @_;
- print "# Diff is as follows:\n";
- untaint_system "diff -u $f1 $f2";
+ print STDERR "# Diff is as follows:\n";
+ untaint_system "diff -u $f1 $f2 | cat -v >&2";
print "\n\n";
}