aboutsummaryrefslogtreecommitdiff
path: root/run_cross_test.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-01-18 21:22:24 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-01-18 21:22:24 +0200
commita5528249ad353384e3c860c7207ef3eedbdcc6b7 (patch)
tree5f2a3fa61e5351231f6ffe8ca6b70d4f811093d7 /run_cross_test.py
parent2d1aa395e86848ca948d30d83cc5357777e5b490 (diff)
parentf7e1d256ad78521052a41fe8f850793fa6cd4f01 (diff)
downloadmeson-a5528249ad353384e3c860c7207ef3eedbdcc6b7.zip
meson-a5528249ad353384e3c860c7207ef3eedbdcc6b7.tar.gz
meson-a5528249ad353384e3c860c7207ef3eedbdcc6b7.tar.bz2
Merge branch 'distutils'.
Diffstat (limited to 'run_cross_test.py')
-rwxr-xr-xrun_cross_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/run_cross_test.py b/run_cross_test.py
index 7355c28..a788850 100755
--- a/run_cross_test.py
+++ b/run_cross_test.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright 2013-2014 The Meson development team
+# Copyright 2013-2016 The Meson development team
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ Not part of the main test suite because of two reasons:
Eventually migrate to something fancier.'''
import os, subprocess, shutil, sys
-import environment
+import mesonbuild.environment as environment
from run_tests import gather_tests