[pypy-commit] pypy default: fix test

bivab noreply at buildbot.pypy.org
Tue Apr 23 18:14:01 CEST 2013


Author: David Schneider <david.schneider at picle.org>
Branch: 
Changeset: r63567:aa774bc17591
Date: 2013-04-23 18:13 +0200
http://bitbucket.org/pypy/pypy/changeset/aa774bc17591/

Log:	fix test

diff --git a/rpython/jit/backend/detect_cpu.py b/rpython/jit/backend/detect_cpu.py
--- a/rpython/jit/backend/detect_cpu.py
+++ b/rpython/jit/backend/detect_cpu.py
@@ -25,7 +25,7 @@
         for macro in v:
             if not getdefined(macro, ''):
                 continue
-            return k
+            return '_'.join(k)
     raise ProcessorAutodetectError, "Cannot detect processor using compiler macros"
 
 
diff --git a/rpython/jit/backend/test/test_detect_cpu.py b/rpython/jit/backend/test/test_detect_cpu.py
--- a/rpython/jit/backend/test/test_detect_cpu.py
+++ b/rpython/jit/backend/test/test_detect_cpu.py
@@ -29,5 +29,5 @@
 
 
 def test_detect_main_model_and_size_from_platform():
-    info = detect_main_model_and_size_from_platform()
+    info = autodetect_main_model_and_size()
     assert detect_main_model_and_size_from_platform() == info


More information about the pypy-commit mailing list