From a465fdfc033dfd3cbe1b909483e536c54f2ee784 Mon Sep 17 00:00:00 2001 From: Tpt Date: Tue, 25 Mar 2014 09:18:32 +0100 Subject: [PATCH] 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 --- tests/phpunit/includes/media/DjVuTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 ) || -- 2.20.1