From cfa0cf4cfea95988609962faa47c87cc37a4921f Mon Sep 17 00:00:00 2001 From: hpk Date: Wed, 18 Mar 2009 22:24:42 +0100 Subject: [PATCH] [svn r63056] try to ignore build directory (which shouldn't be there at all) for rsyncing --HG-- branch : trunk --- py/conftest.py | 2 ++ py/test/config.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/py/conftest.py b/py/conftest.py index 01ae62cb3..8fd2fadec 100644 --- a/py/conftest.py +++ b/py/conftest.py @@ -2,6 +2,8 @@ dist_rsync_roots = ['.'] # XXX pytest_plugins = 'pytest_doctest', 'pytest_pytester', 'pytest_restdoc' +rsyncignore = ['c-extension/greenlet/build'] + import py class PylibTestPlugin: def pytest_addoption(self, parser): diff --git a/py/test/config.py b/py/test/config.py index 3d415e8e0..8695aec2f 100644 --- a/py/test/config.py +++ b/py/test/config.py @@ -168,7 +168,11 @@ class Config(object): except KeyError: return None modpath = py.path.local(mod.__file__).dirpath() - return [modpath.join(x, abs=True) for x in relroots] + l = [] + for relroot in relroots: + relroot = relroot.replace("/", py.path.local.sep) + l.append(modpath.join(relroot, abs=True)) + return l def addoptions(self, groupname, *specs): """ add a named group of options to the current testing session.