aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ericson <git@JohnEricson.me>2018-11-28 00:36:47 -0500
committerJussi Pakkanen <jpakkane@gmail.com>2018-12-03 22:33:20 +0200
commit0fd548e16ff25975d3305f073d7f35fa662ef0c7 (patch)
treef20402b6cdb2057d42e57ad6636655534fc336e7
parent80ac40b7e724913539a225423cec816a67de5f2d (diff)
downloadmeson-0fd548e16ff25975d3305f073d7f35fa662ef0c7.zip
meson-0fd548e16ff25975d3305f073d7f35fa662ef0c7.tar.gz
meson-0fd548e16ff25975d3305f073d7f35fa662ef0c7.tar.bz2
Combine `run_tests` import lines in `run_unittests`
-rw-r--r--mesonbuild/build.py10
-rw-r--r--mesonbuild/coredata.py5
-rwxr-xr-xrun_unittests.py11
3 files changed, 15 insertions, 11 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index e47bd6f..4e826d5 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -22,10 +22,12 @@ from functools import lru_cache
from . import environment
from . import dependencies
from . import mlog
-from .mesonlib import File, MesonException, listify, extract_as_list, OrderedSet
-from .mesonlib import typeslistify, stringlistify, classify_unity_sources
-from .mesonlib import get_filenames_templates_dict, substitute_values
-from .mesonlib import for_windows, for_darwin, for_cygwin, for_android, has_path_sep
+from .mesonlib import (
+ File, MesonException, listify, extract_as_list, OrderedSet,
+ typeslistify, stringlistify, classify_unity_sources,
+ get_filenames_templates_dict, substitute_values,
+ for_windows, for_darwin, for_cygwin, for_android, has_path_sep
+)
from .compilers import is_object, clink_langs, sort_clink, lang_suffixes, get_macos_dylib_install_name
from .interpreterbase import FeatureNew
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py
index ae37576..e5bb959 100644
--- a/mesonbuild/coredata.py
+++ b/mesonbuild/coredata.py
@@ -17,8 +17,9 @@ import pickle, os, uuid, shlex
import sys
from pathlib import PurePath
from collections import OrderedDict
-from .mesonlib import MesonException
-from .mesonlib import default_libdir, default_libexecdir, default_prefix
+from .mesonlib import (
+ MesonException, default_libdir, default_libexecdir, default_prefix
+)
from .wrap import WrapMode
import ast
import argparse
diff --git a/run_unittests.py b/run_unittests.py
index ae2c8c7..cbd031a 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -51,11 +51,12 @@ from mesonbuild.dependencies import PkgConfigDependency, ExternalProgram
from mesonbuild.build import Target
import mesonbuild.modules.pkgconfig
-from run_tests import exe_suffix, get_fake_env, get_meson_script
-from run_tests import get_builddir_target_args, get_backend_commands, Backend
-from run_tests import ensure_backend_detects_changes, run_configure_inprocess
-from run_tests import run_mtest_inprocess
-from run_tests import FakeBuild, FakeCompilerOptions
+from run_tests import (
+ Backend, FakeBuild, FakeCompilerOptions,
+ ensure_backend_detects_changes, exe_suffix, get_backend_commands,
+ get_builddir_target_args, get_fake_env, get_meson_script,
+ run_configure_inprocess, run_mtest_inprocess
+)
def get_dynamic_section_entry(fname, entry):
if is_cygwin() or is_osx():