[pypy-svn] r58382 - pypy/build/testrunner

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Sep 23 16:03:10 2008
New Revision: 58382

Modified:
   pypy/build/testrunner/runner.py
Log:
(iko, pedronis)

normalize dir separators in the test collection code to slashes, given how test are used it should not matter on windows but it will make it easier to write portable config files.



Modified: pypy/build/testrunner/runner.py
==============================================================================
--- pypy/build/testrunner/runner.py	(original)
+++ pypy/build/testrunner/runner.py	Tue Sep 23 16:03:10 2008
@@ -148,6 +148,10 @@
         name = p.basename
         return name.startswith('test_') and name.endswith('.py')
 
+    def reltoroot(self, p):
+        rel = p.relto(self.root)
+        return rel.replace(os.sep, '/')
+
     def collect_one_testdir(self, testdirs, reldir, tests):
         testdirs.append(reldir)
         return
@@ -156,14 +160,14 @@
         if p is None:
             p = self.root
             
-        reldir = p.relto(self.root)
+        reldir = self.reltoroot(p)
         entries = [p1 for p1 in p.listdir() if p1.check(dotfile=0)]
 
         if p != self.root:
             for p1 in entries:
                 if self.is_test_py_file(p1):
                     self.collect_one_testdir(testdirs, reldir,
-                                   [t.relto(self.root) for t in entries
+                                   [self.reltoroot(t) for t in entries
                                     if self.is_test_py_file(t)])
                     return