aboutsummaryrefslogblamecommitdiffstats
path: root/main/spamassassin/fix-test.patch
blob: ee026c54db8f34928f1e91e005ff7ee422edf509 (plain) (tree)





































































                                                                                                            
From 0ae43e7fe4b1e23bc170e16a64c73a8b517c013a Mon Sep 17 00:00:00 2001
From: Henrik Krohns <hege@apache.org>
Date: Mon, 27 Jan 2020 12:21:46 +0000
Subject: [PATCH] Fix strip2.t

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1873205 13f79535-47bb-0310-9956-ffa450edef68
---
 t/strip2.t | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/t/strip2.t b/t/strip2.t
index fb268e2107..4ababeda30 100755
--- a/t/strip2.t
+++ b/t/strip2.t
@@ -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";
 }