diff options
author | Laszlo Nagy <rizsotto.mailinglist@gmail.com> | 2017-03-20 09:03:24 +0000 |
---|---|---|
committer | Laszlo Nagy <rizsotto.mailinglist@gmail.com> | 2017-03-20 09:03:24 +0000 |
commit | a4f54eed615b7bcd7684c85bf14beba5278d3bd5 (patch) | |
tree | 631ac09aa372ed946ad589c9477456c603966d5b /tools/scan-build-py | |
parent | f304e39bb9d423169133175d08ec491ff7003e01 (diff) | |
download | clang-a4f54eed615b7bcd7684c85bf14beba5278d3bd5.tar.gz |
[scan-build-py] use python tempfile for tempdir
Differential Revision: https://reviews.llvm.org/D30862
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@298238 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/scan-build-py')
-rw-r--r-- | tools/scan-build-py/libscanbuild/__init__.py | 6 | ||||
-rw-r--r-- | tools/scan-build-py/libscanbuild/arguments.py | 5 | ||||
-rw-r--r-- | tools/scan-build-py/libscanbuild/intercept.py | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/tools/scan-build-py/libscanbuild/__init__.py b/tools/scan-build-py/libscanbuild/__init__.py index ca75174912..800926ebb6 100644 --- a/tools/scan-build-py/libscanbuild/__init__.py +++ b/tools/scan-build-py/libscanbuild/__init__.py @@ -41,12 +41,6 @@ def duplicate_check(method): return predicate -def tempdir(): - """ Return the default temorary directory. """ - - return os.getenv('TMPDIR', os.getenv('TEMP', os.getenv('TMP', '/tmp'))) - - def run_build(command, *args, **kwargs): """ Run and report build command execution diff --git a/tools/scan-build-py/libscanbuild/arguments.py b/tools/scan-build-py/libscanbuild/arguments.py index fe5725dcdf..2735123f9f 100644 --- a/tools/scan-build-py/libscanbuild/arguments.py +++ b/tools/scan-build-py/libscanbuild/arguments.py @@ -17,7 +17,8 @@ import os import sys import argparse import logging -from libscanbuild import reconfigure_logging, tempdir +import tempfile +from libscanbuild import reconfigure_logging from libscanbuild.clang import get_checkers __all__ = ['parse_args_for_intercept_build', 'parse_args_for_analyze_build', @@ -187,7 +188,7 @@ def create_analyze_parser(from_build_command): '--output', '-o', metavar='<path>', - default=tempdir(), + default=tempfile.gettempdir(), help="""Specifies the output directory for analyzer reports. Subdirectory will be created if default directory is targeted.""") output.add_argument( diff --git a/tools/scan-build-py/libscanbuild/intercept.py b/tools/scan-build-py/libscanbuild/intercept.py index 71b957d83a..b9bf9e9175 100644 --- a/tools/scan-build-py/libscanbuild/intercept.py +++ b/tools/scan-build-py/libscanbuild/intercept.py @@ -31,7 +31,7 @@ import logging from libear import build_libear, TemporaryDirectory from libscanbuild import command_entry_point, compiler_wrapper, \ wrapper_environment, run_command, run_build -from libscanbuild import duplicate_check, tempdir +from libscanbuild import duplicate_check from libscanbuild.compilation import split_command from libscanbuild.arguments import parse_args_for_intercept_build from libscanbuild.shell import encode, decode @@ -84,7 +84,7 @@ def capture(args): for entry in itertools.chain(previous, current) if os.path.exists(entry['file']) and not duplicate(entry)) - with TemporaryDirectory(prefix='intercept-', dir=tempdir()) as tmp_dir: + with TemporaryDirectory(prefix='intercept-') as tmp_dir: # run the build command environment = setup_environment(args, tmp_dir) exit_code = run_build(args.build, env=environment) |