dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "OutputPageTest: Don't assume Vector is the default skin"
[lhc/web/wiklou.git]
/
tests
/
parserTests.php
diff --git
a/tests/parserTests.php
b/tests/parserTests.php
index
1ef6473
..
9965c43
100644
(file)
--- a/
tests/parserTests.php
+++ b/
tests/parserTests.php
@@
-3,7
+3,7
@@
* MediaWiki parser test suite
*
* Copyright © 2004 Brion Vibber <brion@pobox.com>
* MediaWiki parser test suite
*
* Copyright © 2004 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
+ * http
s
://www.mediawiki.org/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-24,11
+24,12
@@
* @ingroup Testing
*/
* @ingroup Testing
*/
-$otions = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
+$otions = array( 'quick', 'color', 'quiet', 'help', 'show-output',
+ 'record', 'run-disabled', 'run-parsoid' );
$optionsWithArgs = array( 'regex', 'filter', 'seed', 'setversion' );
$optionsWithArgs = array( 'regex', 'filter', 'seed', 'setversion' );
-require_once
( __DIR__ . '/../maintenance/commandLine.inc' )
;
-require_once
( __DIR__ . '/TestsAutoLoader.php' )
;
+require_once
__DIR__ . '/../maintenance/commandLine.inc'
;
+require_once
__DIR__ . '/TestsAutoLoader.php'
;
if ( isset( $options['help'] ) ) {
echo <<<ENDS
if ( isset( $options['help'] ) ) {
echo <<<ENDS
@@
-53,6
+54,7
@@
Options:
--seed <n> Start the fuzz test from the specified seed
--help Show this help message
--run-disabled run disabled tests
--seed <n> Start the fuzz test from the specified seed
--help Show this help message
--run-disabled run disabled tests
+ --run-parsoid run parsoid tests (normally disabled)
ENDS;
exit( 0 );
ENDS;
exit( 0 );
@@
-72,7
+74,7
@@
if ( $wgDBtype == 'sqlite' ) {
# refer to $wgTitle directly, but instead use the title
# passed to it.
$wgTitle = Title::newFromText( 'Parser test script do not use' );
# refer to $wgTitle directly, but instead use the title
# passed to it.
$wgTitle = Title::newFromText( 'Parser test script do not use' );
-$tester = new ParserTest(
$options
);
+$tester = new ParserTest(
$options
);
if ( isset( $options['file'] ) ) {
$files = array( $options['file'] );
if ( isset( $options['file'] ) ) {
$files = array( $options['file'] );
@@
-83,11
+85,11
@@
if ( isset( $options['file'] ) ) {
# Print out software version to assist with locating regressions
$version = SpecialVersion::getVersion();
# Print out software version to assist with locating regressions
$version = SpecialVersion::getVersion();
-echo
( "This is MediaWiki version {$version}.\n\n" )
;
+echo
"This is MediaWiki version {$version}.\n\n"
;
if ( isset( $options['fuzz'] ) ) {
$tester->fuzzTest( $files );
} else {
$ok = $tester->runTestsFromFiles( $files );
if ( isset( $options['fuzz'] ) ) {
$tester->fuzzTest( $files );
} else {
$ok = $tester->runTestsFromFiles( $files );
- exit
( $ok ? 0 : 1 );
+ exit( $ok ? 0 : 1 );
}
}