moving py/bin to rootlevel bin/ and fixing tests
--HG-- branch : trunk
This commit is contained in:
		
							parent
							
								
									cc15685015
								
							
						
					
					
						commit
						92d482069c
					
				|  | @ -301,7 +301,7 @@ class TmpTestdir: | |||
|         return self.run(*fullargs) | ||||
| 
 | ||||
|     def _getpybinargs(self, scriptname): | ||||
|         bindir = py.path.local(py.__file__).dirpath("bin") | ||||
|         bindir = py._impldir.dirpath('bin') | ||||
|         script = bindir.join(scriptname) | ||||
|         assert script.check() | ||||
|         return py.std.sys.executable, script | ||||
|  |  | |||
|  | @ -1,10 +1,12 @@ | |||
| import py | ||||
| import sys | ||||
| 
 | ||||
| binpath = py.path.local(py.__file__).dirpath("bin") | ||||
| binwinpath = binpath.join("win32") | ||||
| 
 | ||||
| def setup_module(mod): | ||||
|     mod.binpath = py._impldir.dirpath('bin') | ||||
|     if not mod.binpath.check(): | ||||
|         py.test.skip("bin-source scripts not installed") | ||||
|     mod.binwinpath = binpath.join("win32") | ||||
|     mod.tmpdir = py.test.ensuretemp(__name__) | ||||
|     mod.iswin32 = sys.platform == "win32" | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue