equal
deleted
inserted
replaced
2354 self._testdir = osenvironb[b'TESTDIR'] = getattr( |
2354 self._testdir = osenvironb[b'TESTDIR'] = getattr( |
2355 os, 'getcwdb', os.getcwd)() |
2355 os, 'getcwdb', os.getcwd)() |
2356 # assume all tests in same folder for now |
2356 # assume all tests in same folder for now |
2357 if testdescs: |
2357 if testdescs: |
2358 pathname = os.path.dirname(testdescs[0]['path']) |
2358 pathname = os.path.dirname(testdescs[0]['path']) |
2359 if pathname and not osenvironb[b'TESTDIR'].endswith(b'/'): |
2359 if pathname: |
2360 osenvironb[b'TESTDIR'] += b'/' |
2360 osenvironb[b'TESTDIR'] = os.path.join(osenvironb[b'TESTDIR'], |
2361 osenvironb[b'TESTDIR'] += pathname |
2361 pathname) |
2362 if self.options.outputdir: |
2362 if self.options.outputdir: |
2363 self._outputdir = canonpath(_bytespath(self.options.outputdir)) |
2363 self._outputdir = canonpath(_bytespath(self.options.outputdir)) |
2364 else: |
2364 else: |
2365 self._outputdir = self._testdir |
2365 self._outputdir = self._testdir |
2366 |
2366 |