[pypy-commit] pypy default: Backout bd58f90

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: 
Changeset: r84979:b9e345296b3c
Date: 2016-06-06 19:10 +0100
http://bitbucket.org/pypy/pypy/changeset/b9e345296b3c/

Log:	Backout bd58f90

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -23,10 +23,11 @@
 def pytest_report_header():
     return "pytest-%s from %s" % (pytest.__version__, pytest.__file__)
 
+def pytest_addhooks(pluginmanager):
+    from rpython.conftest import LeakFinder
+    pluginmanager.register(LeakFinder())
+
 def pytest_configure(config):
-    if not config.option.runappdirect:
-        from rpython.conftest import LeakFinder
-        config.pluginmanager.register(LeakFinder())
     global option
     option = config.option