From: Tpt <thomaspt@hotmail.fr>
Date: Tue, 25 Mar 2014 08:18:32 +0000 (+0100)
Subject: Use /usr/bin/ as default folder for DjVu tools in unit tests
X-Git-Tag: 1.31.0-rc.0~16497^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=a465fdfc033dfd3cbe1b909483e536c54f2ee784;p=lhc%2Fweb%2Fwiklou.git

Use /usr/bin/ as default folder for DjVu tools in unit tests

It's the path in most GNU/Linux distributions

Allows also tests to run in Travis

Change-Id: I2fead84184dca94e1407104287f42ebf6112d712
---

diff --git a/tests/phpunit/includes/media/DjVuTest.php b/tests/phpunit/includes/media/DjVuTest.php
index e568eaf5ca..aedc23ad8e 100644
--- a/tests/phpunit/includes/media/DjVuTest.php
+++ b/tests/phpunit/includes/media/DjVuTest.php
@@ -24,9 +24,9 @@ class DjVuTest extends MediaWikiTestCase {
 		parent::setUp();
 
 		//cli tool setup
-		$wgDjvuRenderer = $wgDjvuRenderer ? $wgDjvuRenderer : '/usr/local/bin/ddjvu';
-		$wgDjvuDump = $wgDjvuDump ? $wgDjvuDump : '/usr/local/bin/djvudump';
-		$wgDjvuToXML = $wgDjvuToXML ? $wgDjvuToXML : '/usr/local/bin/djvutoxml';
+		$wgDjvuRenderer = $wgDjvuRenderer ? $wgDjvuRenderer : '/usr/bin/ddjvu';
+		$wgDjvuDump = $wgDjvuDump ? $wgDjvuDump : '/usr/bin/djvudump';
+		$wgDjvuToXML = $wgDjvuToXML ? $wgDjvuToXML : '/usr/bin/djvutoxml';
 		if (
 			!$this->checkIfToolExists( $wgDjvuRenderer ) ||
 			!$this->checkIfToolExists( $wgDjvuDump ) ||