# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1335715122 -3600
# Node ID bd418e7e2d294301acaccde7ff23c48afca73766
# Parent  a3385251155855a6256caea5a44511b6cfff68c4# Parent  c1d229864cd37345a90a1c42697e695de7ba91ae
Merge with stable

diff -r a33852511558 -r bd418e7e2d29 tests/run-tests.py
--- a/tests/run-tests.py	Fri Apr 06 22:53:24 2012 +0200
+++ b/tests/run-tests.py	Sun Apr 29 16:58:42 2012 +0100
@@ -209,7 +209,7 @@
     if options.local:
         testdir = os.path.dirname(os.path.realpath(sys.argv[0]))
         hgbin = os.path.join(os.path.dirname(testdir), 'hg')
-        if not os.access(hgbin, os.X_OK):
+        if os.name != 'nt' and not os.access(hgbin, os.X_OK):
             parser.error('--local specified, but %r not found or not executable'
                          % hgbin)
         options.with_hg = hgbin