From bc6d939eaabb25954ac45a08e716d1c08e229eaf Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Wed, 18 Jun 2014 16:05:41 -0300 Subject: [PATCH] Fix DjVu test (Make sure to check for djvutxt binary) Bug: 61070 Change-Id: Ib5e7c89a51d0872b32bbcd6b7e3db830c2e5e8a6 --- tests/testHelpers.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/testHelpers.inc b/tests/testHelpers.inc index 818b24e23c..a0340314b9 100644 --- a/tests/testHelpers.inc +++ b/tests/testHelpers.inc @@ -674,11 +674,12 @@ class DjVuSupport { * Initialises DjVu tools global with default values */ public function __construct() { - global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML, $wgFileExtensions; + global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML, $wgFileExtensions, $wgDjvuTxt; $wgDjvuRenderer = $wgDjvuRenderer ? $wgDjvuRenderer : '/usr/bin/ddjvu'; $wgDjvuDump = $wgDjvuDump ? $wgDjvuDump : '/usr/bin/djvudump'; $wgDjvuToXML = $wgDjvuToXML ? $wgDjvuToXML : '/usr/bin/djvutoxml'; + $wgDjvuTxt = $wgDjvuTxt ? $wgDjvuTxt : '/usr/bin/djvutxt'; if ( !in_array( 'djvu', $wgFileExtensions ) ) { $wgFileExtensions[] = 'djvu'; @@ -691,10 +692,11 @@ class DjVuSupport { * @return bool */ public function isEnabled() { - global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML; + global $wgDjvuRenderer, $wgDjvuDump, $wgDjvuToXML, $wgDjvuTxt; return is_executable( $wgDjvuRenderer ) && is_executable( $wgDjvuDump ) - && is_executable( $wgDjvuToXML ); + && is_executable( $wgDjvuToXML ) + && is_executable( $wgDjvuTxt ); } } -- 2.20.1