| Index: trunk/phase3/tests/phpunit/includes/GlobalFunctions/GlobalTest.php |
| — | — | @@ -909,6 +909,10 @@ |
| 910 | 910 | * @dataProvider provideWfShellMaintenanceCmdList |
| 911 | 911 | */ |
| 912 | 912 | function testWfShellMaintenanceCmd( $script, $parameters, $options, $expected, $description ) { |
| | 913 | + if( wfIsWindows() ) { |
| | 914 | + // Approximation that's good enough for our purposes just now |
| | 915 | + $expected = str_replace( "'", '"', $expected ); |
| | 916 | + } |
| 913 | 917 | $actual = wfShellMaintenanceCmd( $script, $parameters, $options ); |
| 914 | 918 | $this->assertEquals( $expected, $actual, $description ); |
| 915 | 919 | } |
| — | — | @@ -917,16 +921,16 @@ |
| 918 | 922 | global $wgPhpCli; |
| 919 | 923 | return array( |
| 920 | 924 | array( 'eval.php', array( '--help', '--test' ), array(), |
| 921 | | - "\"$wgPhpCli\" \"eval.php\" \"--help\" \"--test\"", |
| | 925 | + "'$wgPhpCli' 'eval.php' '--help' '--test'", |
| 922 | 926 | "Called eval.php --help --test" ), |
| 923 | 927 | array( 'eval.php', array( '--help', '--test space' ), array('php' => 'php5'), |
| 924 | | - "\"php5\" \"eval.php\" \"--help\" \"--test space\"", |
| | 928 | + "'php5' 'eval.php' '--help' '--test space'", |
| 925 | 929 | "Called eval.php --help --test with php option" ), |
| 926 | 930 | array( 'eval.php', array( '--help', '--test', 'X' ), array('wrapper' => 'MWScript.php'), |
| 927 | | - "\"$wgPhpCli\" \"MWScript.php\" \"eval.php\" \"--help\" \"--test\" \"X\"", |
| | 931 | + "'$wgPhpCli' 'MWScript.php' 'eval.php' '--help' '--test' 'X'", |
| 928 | 932 | "Called eval.php --help --test with wrapper option" ), |
| 929 | 933 | array( 'eval.php', array( '--help', '--test', 'y' ), array('php' => 'php5', 'wrapper' => 'MWScript.php'), |
| 930 | | - "\"php5\" \"MWScript.php\" \"eval.php\" \"--help\" \"--test\" \"y\"", |
| | 934 | + "'php5' 'MWScript.php' 'eval.php' '--help' '--test' 'y'", |
| 931 | 935 | "Called eval.php --help --test with wrapper and php option" ), |
| 932 | 936 | ); |
| 933 | 937 | } |