diff options
| author |   Armin Rigo <arigo@tunes.org> | 2009-12-01 10:56:34 +0000 |
|---|---|---|
| committer | Armin Rigo <arigo@tunes.org> | 2009-12-01 10:56:34 +0000 |
| commit | 0868c1fc43a4ce9db10f8a95034aa03757e989b5 (patch) | |
| tree | b32334affd3b208ee416e16a1665b39963cfa45c /pypy/testrunner_cfg.py | |
| parent | Add str_w to the TinyObjSpace, to "fix" app-level tests of the locale module (diff) | |
| download | pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.tar.gz pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.tar.bz2 pypy-0868c1fc43a4ce9db10f8a95034aa03757e989b5.zip | |
Merge the branch/virtual-forcing so far, introducing proper forcing of
virtualizables followed by a guard failure when we eventually return to
assembler. This also changes the front-end so that it always aborts a
trace after the virtualizable was forced.
The changes are not very ootype-friendly. The CLI tests are disabled
for now.
Fix the write analyzer to give the correct answer even when calling
external functions that may call back.
svn merge -r69626:69792 svn+ssh://codespeak.net/svn/pypy/branch/virtual-forcing .
Diffstat (limited to 'pypy/testrunner_cfg.py')
| -rw-r--r-- | pypy/testrunner_cfg.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pypy/testrunner_cfg.py b/pypy/testrunner_cfg.py index eb108dc92e..c9e11536aa 100644 --- a/pypy/testrunner_cfg.py +++ b/pypy/testrunner_cfg.py @@ -7,7 +7,8 @@ def collect_one_testdir(testdirs, reldir, tests): reldir.startswith('rlib/test') or reldir.startswith('rpython/memory/') or reldir.startswith('jit/backend/x86/') or - reldir.startswith('jit/backend/cli')): + #reldir.startswith('jit/backend/cli') or + 0): testdirs.extend(tests) else: testdirs.append(reldir) |