jenkins-bot has submitted this change and it was merged.
Change subject: Use /usr/bin/ as default folder for DjVu tools in unit tests
......................................................................
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
---
M tests/phpunit/includes/media/DjVuTest.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/includes/media/DjVuTest.php
b/tests/phpunit/includes/media/DjVuTest.php
index e568eaf..aedc23a 100644
--- a/tests/phpunit/includes/media/DjVuTest.php
+++ b/tests/phpunit/includes/media/DjVuTest.php
@@ -24,9 +24,9 @@
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 ) ||
--
To view, visit https://gerrit.wikimedia.org/r/120756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fead84184dca94e1407104287f42ebf6112d712
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
