Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Sun, 29 Apr 2012 16:58:42 +0100
changeset 1066 bd418e7e2d29
parent 1064 a33852511558 (current diff)
parent 1065 c1d229864cd3 (diff)
child 1074 6c7d0e38c0c2
Merge with stable
--- 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