diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-05 00:03:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-05 00:03:34 +0200 |
commit | 0744601fda65c2cd3e02c6705533493ed7b4e501 (patch) | |
tree | 5dcbc8401a2ef94c723fce46c0d2e1899ed42adf /run_unittests.py | |
parent | 80b101d5f376835e3f31604797e98a5a9f3b2fd3 (diff) | |
parent | 390333a18dfa1d8ec8fefe25f638902700ddb82e (diff) | |
download | meson-0744601fda65c2cd3e02c6705533493ed7b4e501.zip meson-0744601fda65c2cd3e02c6705533493ed7b4e501.tar.gz meson-0744601fda65c2cd3e02c6705533493ed7b4e501.tar.bz2 |
Merge pull request #3171 from jon-turney/flake8
Fix flake8 issues
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/run_unittests.py b/run_unittests.py index 6312353..c2299ca 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -21,7 +21,6 @@ import tempfile import textwrap import os import shutil -import sys import unittest from unittest import mock from configparser import ConfigParser @@ -1360,9 +1359,9 @@ class AllPlatformTests(BasePlatformTests): subprocess.check_call(['git', 'config', 'user.email', 'teh_coderz@example.com'], cwd=project_dir) subprocess.check_call(['git', 'add', 'meson.build', 'distexe.c'], cwd=project_dir, - stdout=subprocess.DEVNULL) + stdout=subprocess.DEVNULL) subprocess.check_call(['git', 'commit', '-a', '-m', 'I am a project'], cwd=project_dir, - stdout=subprocess.DEVNULL) + stdout=subprocess.DEVNULL) try: self.dist_impl(git_init) @@ -1503,7 +1502,6 @@ int main(int argc, char **argv) { cmd += ['-c', source, '-o', objectfile] + extra_args subprocess.check_call(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) - def test_prebuilt_object(self): (compiler, _, object_suffix, _) = self.detect_prebuild_env() tdir = os.path.join(self.unit_test_dir, '14 prebuilt object') @@ -1995,8 +1993,8 @@ class FailureTests(BasePlatformTests): env = Environment('', self.builddir, self.meson_command, get_fake_options(self.prefix), []) try: - objc = env.detect_objc_compiler(False) - objcpp = env.detect_objcpp_compiler(False) + env.detect_objc_compiler(False) + env.detect_objcpp_compiler(False) except EnvironmentException: code = "add_languages('objc')\nadd_languages('objcpp')" self.assertMesonRaises(code, "Unknown compiler") |