Merge with crew
authorMatt Mackall <mpm@selenic.com>
Tue, 23 Mar 2010 17:24:17 -0500
changeset 10767 63c6c2d1123c
parent 10764 df1b0c8c59cc (current diff)
parent 10766 afbcea270bb8 (diff)
child 10769 d70ada7e987d
Merge with crew
--- a/tests/run-tests.py	Tue Mar 23 17:06:58 2010 -0500
+++ b/tests/run-tests.py	Tue Mar 23 17:24:17 2010 -0500
@@ -144,7 +144,8 @@
     (options, args) = parser.parse_args()
 
     # jython is always pure
-    options.pure = options.pure or 'java' in sys.platform
+    if 'java' in sys.platform or '__pypy__' in sys.modules:
+        options.pure = True
 
     if options.with_hg:
         if not (os.path.isfile(options.with_hg) and