aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2019-05-09 21:42:53 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2019-05-16 00:27:57 +0300
commit957d8e051c0c29beb0106e75ae7a71acc5c62cf5 (patch)
tree19bb30d1cca5db43b7f540b718a9607a23a6d96a /run_unittests.py
parent38b347ecd026b8b0f6b533392a23aeeda5221713 (diff)
downloadmeson-957d8e051c0c29beb0106e75ae7a71acc5c62cf5.zip
meson-957d8e051c0c29beb0106e75ae7a71acc5c62cf5.tar.gz
meson-957d8e051c0c29beb0106e75ae7a71acc5c62cf5.tar.bz2
Make `PerMachine` and `MachineChoice` have just `build` and `host`
Meson itself *almost* only cares about the build and host platforms. The exception is it takes a `target_machine` in the cross file and exposes it to the user; but it doesn't do anything else with it. It's therefore overkill to put target in `PerMachine` and `MachineChoice`. Instead, we make a `PerThreeMachine` only for the machine infos. Additionally fix a few other things that were bugging me in the process: - Get rid of `MachineInfos` class. Since `envconfig.py` was created, it has no methods that couldn't just got on `PerMachine` - Make `default_missing` and `miss_defaulting` work functionally. That means we can just locally bind rather than bind as class vars the "unfrozen" configuration. This helps prevent bugs where one forgets to freeze a configuration.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index f4d969c..7242a5f 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -848,7 +848,7 @@ class InternalTests(unittest.TestCase):
PkgConfigDependency.check_pkgconfig = old_check
# Reset dependency class to ensure that in-process configure doesn't mess up
PkgConfigDependency.pkgbin_cache = {}
- PkgConfigDependency.class_pkgbin = PerMachine(None, None, None)
+ PkgConfigDependency.class_pkgbin = PerMachine(None, None)
def test_version_compare(self):
comparefunc = mesonbuild.mesonlib.version_compare_many