aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-04-06 23:10:20 +0300
commitcab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch)
tree70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/environment.py
parent5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff)
parent3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff)
downloadmeson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz
meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index df848f8..6ff93cb 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -19,7 +19,7 @@ import configparser
build_filename = 'meson.build'
-class EnvironmentException(coredata.MesonException):
+class EnvironmentException(mesonlib.MesonException):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -657,11 +657,11 @@ class CrossBuildInfo():
if 'target_machine' in self.config:
return
if not 'host_machine' in self.config:
- raise coredata.MesonException('Cross info file must have either host or a target machine.')
+ raise mesonlib.MesonException('Cross info file must have either host or a target machine.')
if not 'properties' in self.config:
- raise coredata.MesonException('Cross file is missing "properties".')
+ raise mesonlib.MesonException('Cross file is missing "properties".')
if not 'binaries' in self.config:
- raise coredata.MesonException('Cross file is missing "binaries".')
+ raise mesonlib.MesonException('Cross file is missing "binaries".')
def ok_type(self, i):
return isinstance(i, str) or isinstance(i, int) or isinstance(i, bool)