From: Max Semenik <maxsem@users.mediawiki.org>
Date: Tue, 6 Sep 2011 15:20:07 +0000 (+0000)
Subject: Even on Windows, some people have diff ;)
X-Git-Tag: 1.31.0-rc.0~27875
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=0ed5d2e741327ca6c3341adc9af92826a93ccd3a;p=lhc%2Fweb%2Fwiklou.git

Even on Windows, some people have diff ;)
---

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 );