Use /usr/bin/ as default folder for DjVu tools in unit tests
authorTpt <thomaspt@hotmail.fr>
Tue, 25 Mar 2014 08:18:32 +0000 (09:18 +0100)
committerTpt <thomaspt@hotmail.fr>
Tue, 25 Mar 2014 08:18:32 +0000 (09:18 +0100)
It's the path in most GNU/Linux distributions

Allows also tests to run in Travis

Change-Id: I2fead84184dca94e1407104287f42ebf6112d712

tests/phpunit/includes/media/DjVuTest.php

index e568eaf..aedc23a 100644 (file)
@@ -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 ) ||