[pypy-svn] pypy commit e7f4b2039570: merge heads

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Armin Rigo <arigo at tunes.org>
# Date 1292344623 -3600
# Node ID e7f4b203957094f99e65c80d803543f92c13dd9e
# Parent  45e0881a379bfaddb9e5bdd2baf0b6477f3b6e23
# Parent  11dd42c70507da9dc1ae3c2692f4ccaa4b3ade90
merge heads

--- a/pypy/rlib/rsdl/conftest.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from pypy.rlib.rsdl.eci import check_sdl_installation, SDLNotInstalled
-import py
-
-def pytest_collect_directory():
-    try:
-        check_sdl_installation()
-    except SDLNotInstalled, e:
-        py.test.skip("SDL not installed(?): %s" % (e,))

--- a/pypy/jit/backend/llvm/conftest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import py
-
-def pytest_collect_directory():
-    py.test.skip("llvm backend tests skipped for now")

--- a/pypy/jit/backend/cli/conftest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import py
-
-def pytest_collect_directory(path):
-    py.test.skip("CLI backend tests skipped for now")