From 0ed5d2e741327ca6c3341adc9af92826a93ccd3a Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Tue, 6 Sep 2011 15:20:07 +0000 Subject: [PATCH] Even on Windows, some people have diff ;) --- tests/parser/parserTest.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc index 4782bdac7d..b52afb44d9 100644 --- a/tests/parser/parserTest.inc +++ b/tests/parser/parserTest.inc @@ -1068,7 +1068,9 @@ class ParserTest { $shellInfile = wfEscapeShellArg($infile); $shellOutfile = wfEscapeShellArg($outfile); - $diff = wfIsWindows() + global $wgDiff3; + // we assume that people with diff3 also have usual diff + $diff = ( wfIsWindows() && !$wgDiff3 ) ? `fc $shellInfile $shellOutfile` : `diff -au $shellInfile $shellOutfile`; unlink( $infile ); -- 2.20.1