8000 Add --tempdir option for test run by zooba · Pull Request #10322 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

Add --tempdir option for test run #10322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 17, 2018
Merged

Add --tempdir option for test run #10322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32a60b6
Add --tempdir option for test run
zooba Nov 4, 2018
994787a
Remove envvar override
zooba Nov 4, 2018
7270516
Simplify call to create TEMPDIR
zooba Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
- script: python.bat -m test.pythoninfo
displayName: 'Display build info'

- script: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results.xml"
- script: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 -j0 --junit-xml="$(Build.BinariesDirectory)\test-results.xml" --tempdir="$(Build.BinariesDirectory)\test"
displayName: 'Tests'
env:
PREFIX: $(Py_OutDir)\$(arch)
Expand Down
6 changes: 3 additions & 3 deletions Lib/test/libregrtest/cmdline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ def _create_parser():
group.add_argument('--junit-xml', dest='xmlpath', metavar='FILENAME',
help='writes JUnit-style XML results to the specified '
'file')

group.add_argument('--tempdir', dest='tempdir', metavar='PATH',
help='override the working directory for the test run')
return parser


Expand Down Expand Up @@ -383,8 +384,7 @@ def _parse_args(args, **kwargs):
if ns.match_filename:
if ns.match_tests is None:
ns.match_tests = []
filename = os.path.join(support.SAVEDCWD, ns.match_filename)
with open(filename) as fp:
with open(ns.match_filename) as fp:
for line in fp:
ns.match_tests.append(line.strip())

Expand Down
12 changes: 5 additions & 7 deletions Lib/test/libregrtest/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,12 +550,12 @@ def save_xml_result(self):

def main(self, tests=None, **kwargs):
global TEMPDIR
self.ns = self.parse_args(kwargs)

if sysconfig.is_python_build():
try:
os.mkdir(TEMPDIR)
except FileExistsError:
pass
if self.ns.tempdir:
TEMPDIR = self.ns.tempdir

os.makedirs(TEMPDIR, exist_ok=True)

# Define a writable temp dir that will be used as cwd while running
# the tests. The name of the dir includes the pid to allow parallel
Expand All @@ -571,8 +571,6 @@ def main(self, tests=None, **kwargs):
self._main(tests, kwargs)

def _main(self, tests, kwargs):
self.ns = self.parse_args(kwargs)

if self.ns.huntrleaks:
warmup, repetitions, _ = self.ns.huntrleaks
if warmup < 1 or repetitions < 1:
Expand Down
0