| Index: trunk/phase3/tests/parserTests.php |
| — | — | @@ -21,13 +21,13 @@ |
| 22 | 22 | * http://www.gnu.org/copyleft/gpl.html |
| 23 | 23 | * |
| 24 | 24 | * @file |
| 25 | | - * @ingroup Maintenance |
| | 25 | + * @ingroup Testing |
| 26 | 26 | */ |
| 27 | 27 | |
| 28 | 28 | $options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' ); |
| 29 | 29 | $optionsWithArgs = array( 'regex', 'seed', 'setversion' ); |
| 30 | 30 | |
| 31 | | -require_once( dirname( __FILE__ ) . '/../commandLine.inc' ); |
| | 31 | +require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' ); |
| 32 | 32 | |
| 33 | 33 | if ( isset( $options['help'] ) ) { |
| 34 | 34 | echo <<<ENDS |
| — | — | @@ -59,8 +59,9 @@ |
| 60 | 60 | |
| 61 | 61 | # Cases of weird db corruption were encountered when running tests on earlyish |
| 62 | 62 | # versions of SQLite |
| 63 | | -if ( wfGetDB( DB_MASTER )->getType() == 'sqlite' ) { |
| 64 | | - $version = wfGetDB( DB_MASTER )->getServerVersion(); |
| | 63 | +if ( $wgDBtype == 'sqlite' ) { |
| | 64 | + $db = wfGetDB( DB_MASTER ); |
| | 65 | + $version = $db->getServerVersion(); |
| 65 | 66 | if ( version_compare( $version, '3.6' ) < 0 ) { |
| 66 | 67 | die( "Parser tests require SQLite version 3.6 or later, you have $version\n" ); |
| 67 | 68 | } |