aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-04-06 22:59:21 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-04-06 22:59:21 +0300
commit5d53c6b7415b62f2172129a61770cf38aa3f3c1d (patch)
tree2b040ffc4da92fca31c4b507c3cc4ec5e97c8694 /mesonbuild/environment.py
parent536edb65d6d379f8eb50c2c1c9d21362ab5f75a1 (diff)
parent435700aeb00d9267b027801b688d677ccdc93903 (diff)
downloadmeson-5d53c6b7415b62f2172129a61770cf38aa3f3c1d.zip
meson-5d53c6b7415b62f2172129a61770cf38aa3f3c1d.tar.gz
meson-5d53c6b7415b62f2172129a61770cf38aa3f3c1d.tar.bz2
Merge pull request #503 from nioncode/windows-parallel-test
Merge Windows parallel test fix.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index bfd1c35..df848f8 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -58,7 +58,6 @@ class Environment():
log_dir = 'meson-logs'
coredata_file = os.path.join(private_dir, 'coredata.dat')
version_regex = '\d+(\.\d+)+(-[a-zA-Z0-9]+)?'
-
def __init__(self, source_dir, build_dir, main_script_file, options, original_cmd_line_args):
assert(os.path.isabs(main_script_file))
assert(not os.path.islink(main_script_file))