[pypy-commit] pypy default: Mostly backout 958f05aaec24 (can't find a justification, and

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r57240:96b4d5d99a21
Date: 2012-09-08 09:58 +0200
http://bitbucket.org/pypy/pypy/changeset/96b4d5d99a21/

Log:	Mostly backout 958f05aaec24 (can't find a justification, and it
	breaks e.g. on tannit32 because platform.machine() doesn't start
	with 'x86' there). Instead, always list both backends.

diff --git a/pypy/testrunner_cfg.py b/pypy/testrunner_cfg.py
--- a/pypy/testrunner_cfg.py
+++ b/pypy/testrunner_cfg.py
@@ -1,30 +1,13 @@
 # nightly test configuration for the paraller runner
 import os
-import platform
-
-# manually set variables to force some specific form of machine based collection
-_ARM = platform.machine().startswith('arm')
-_X86 = platform.machine().startswith('x86')
 
 DIRS_SPLIT = [
     'translator/c', 'translator/jvm', 'rlib',
     'rpython/memory', 'jit/metainterp', 'rpython/test',
+    'jit/backend/arm', 'jit/backend/x86',
 ]
-backend_tests = {'arm':'jit/backend/arm', 'x86':'jit/backend/x86'}
-
-def add_backend_tests():
-    l = []
-    if _ARM:
-        l.append('arm')
-    if _X86: # X86 for now, adapt as required for PPC
-        l.append('x86')
-    for i in l:
-        if backend_tests[i] in DIRS_SPLIT:
-            continue
-        DIRS_SPLIT.append(backend_tests[i])
 
 def collect_one_testdir(testdirs, reldir, tests):
-    add_backend_tests()
     for dir in DIRS_SPLIT:
         if reldir.startswith(dir):
             testdirs.extend(tests)