svn commit: r1901450 - /spamassassin/trunk/t/extracttext.t

[he...@apache.org]

Author: hege
Date: Tue May 31 13:28:28 2022
New Revision: 1901450

URL: http://svn.apache.org/viewvc?rev=1901450&view=rev
Log:
Bug 8001 - extracttext.t test failure

Modified:
    spamassassin/trunk/t/extracttext.t

Modified: spamassassin/trunk/t/extracttext.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/extracttext.t?rev=1901450&r1=1901449&r2=1901450&view=diff
==============================================================================
--- spamassassin/trunk/t/extracttext.t (original)
+++ spamassassin/trunk/t/extracttext.t Tue May 31 13:28:28 2022
@@ -5,24 +5,26 @@ use SATest; sa_t_init("extracttext");
 
 use Test::More;
 
-use constant HAS_PDFTOTEXT => eval { $_ = untaint_cmd("which pdftotext"); chomp; -x };
-use constant HAS_TESSERACT => eval { $_ = untaint_cmd("which tesseract"); chomp; -x };
+plan skip_all => "Tests don't work on windows" if $RUNNING_ON_WINDOWS;
+
+use constant PDFTOTEXT => eval { $_ = untaint_cmd("which pdftotext"); chomp; -x && $_ };
+use constant TESSERACT => eval { $_ = untaint_cmd("which tesseract"); chomp; -x && $_ };
 
 my $tests = 0;
-$tests += 2 if (HAS_PDFTOTEXT);
-$tests += 1 if (HAS_TESSERACT);
+$tests += 2 if (PDFTOTEXT);
+$tests += 1 if (TESSERACT);
 if ($tests && $tests < 3) { diag("some binaries missing, not running all tests\n"); }
 
-plan skip_all => "no needed binaries found" unless $tests;
+plan skip_all => "no needed binaries found, pdftotext or tesseract" unless $tests;
 plan tests => $tests;
 
 %patterns_gtube = (
   q{ 1000 GTUBE }, 'gtube',
 );
 
-if (HAS_PDFTOTEXT) {
+if (PDFTOTEXT) {
    tstprefs("
-     extracttext_external  pdftotext  /usr/bin/pdftotext -nopgbrk -layout -enc UTF-8 {} -
+     extracttext_external  pdftotext  ".PDFTOTEXT." -nopgbrk -layout -enc UTF-8 {} -
      extracttext_use       pdftotext  .pdf
      extracttext_timeout 30 40
    ");
@@ -34,7 +36,7 @@ if (HAS_PDFTOTEXT) {
 
    # Should fail
    tstprefs("
-     extracttext_external  pdftotext  /usr/bin/pdftotext -nopgbrk -layout -enc UTF-8 {} -
+     extracttext_external  pdftotext  ".PDFTOTEXT." -nopgbrk -layout -enc UTF-8 {} -
      extracttext_use       pdftotext  .FOO
      extracttext_timeout 30 40
    ");
@@ -45,9 +47,9 @@ if (HAS_PDFTOTEXT) {
    clear_pattern_counters();
 }
 
-if (HAS_TESSERACT) {
+if (TESSERACT) {
    tstprefs("
-     extracttext_external  tesseract  {OMP_THREAD_LIMIT=1} /usr/bin/tesseract -c page_separator= {} -
+     extracttext_external  tesseract  {OMP_THREAD_LIMIT=1} ".TESSERACT." -c page_separator= {} -
      extracttext_use       tesseract  .jpg .png .bmp .tif .tiff image/(?:jpeg|png|x-ms-bmp|tiff)
      extracttext_timeout 30 1
    ");