fix standalone script generation on windows, make tests not do a chdir() so that distributed testing discovers the transferred lib

--HG--
branch : trunk

py/plugin/pytest_genscript.py

@@ -40,7 +40,7 @@ def main(pybasedir, outfile, infile):
 
     name2src = {}
     for f in files:
-        k = f.replace("/", ".")[:-3]
+        k = f.replace(os.sep, ".")[:-3]
         name2src[k] = open(f, "rb").read()
 
     data = pickle.dumps(name2src, 2)

py/plugin/pytest_pytester.py

@@ -69,8 +69,8 @@ class TmpTestdir:
         self.tmpdir = tmpdir.mkdir(name)
         self.plugins = []
         self._syspathremove = []
-        self.chdir() # always chdir
-        assert hasattr(self, '_olddir')
+        if not hasattr(request.function, "nochdir"):
+            self.chdir() # always chdir
         self.request.addfinalizer(self.finalize)
 
     def __repr__(self):
@@ -280,12 +280,7 @@ class TmpTestdir:
         return py.std.subprocess.Popen(cmdargs, stdout=stdout, stderr=stderr, **kw)
 
     def run(self, *cmdargs):
-        old = self.tmpdir.chdir()
-        #print "chdir", self.tmpdir
-        try:
-            return self._run(*cmdargs)
-        finally:
-            old.chdir()
+        return self._run(*cmdargs)
 
     def _run(self, *cmdargs):
         cmdargs = [str(x) for x in cmdargs]