jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337513 )
Change subject: Don't test for tidy class on hhvm
......................................................................
Don't test for tidy class on hhvm
* It doesn't support the oo interface.
* Should make the tidy tests run in CI.
Bug: T157730
Change-Id: Ied80f70b7cafcf64d736cb0eeb1a30d52c1d7921
---
M tests/parser/TidySupport.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/parser/TidySupport.php b/tests/parser/TidySupport.php
index 6b5fb48..39c9ca5 100644
--- a/tests/parser/TidySupport.php
+++ b/tests/parser/TidySupport.php
@@ -58,7 +58,7 @@
'tidyConfigFile' =>
"$IP/includes/tidy/tidy.conf",
'tidyCommandLine' => '',
];
- if ( extension_loaded( 'tidy' ) && class_exists( 'tidy'
) ) {
+ if ( extension_loaded( 'tidy' ) && ( wfIsHHVM() ||
class_exists( 'tidy' ) ) ) {
$this->config['driver'] = wfIsHHVM() ?
'RaggettInternalHHVM' : 'RaggettInternalPHP';
} else {
if ( is_executable( $wgTidyBin ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/337513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied80f70b7cafcf64d736cb0eeb1a30d52c1d7921
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
