aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-06-05 13:00:57 +0300
commit0bc00560644d20daee626533fc6e6294d92caa78 (patch)
treeef21d8363c6943a3f18a33b07c9226ff6231164b /run_tests.py
parent177e286b3c761f461ac55ede934b941384b4bb97 (diff)
parentfba749fcb7a9654db78d45157477589e4352c2e1 (diff)
downloadmeson-0bc00560644d20daee626533fc6e6294d92caa78.zip
meson-0bc00560644d20daee626533fc6e6294d92caa78.tar.gz
meson-0bc00560644d20daee626533fc6e6294d92caa78.tar.bz2
Merge pull request #577 from nioncode/vs2015
Implement vs2015 backend
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/run_tests.py b/run_tests.py
index 0a47157..1c6ae11 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -31,7 +31,7 @@ import time
import multiprocessing
import concurrent.futures as conc
-from mesonbuild.mesonmain import backendlist
+from mesonbuild.coredata import backendlist
class TestResult:
def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0):
@@ -100,6 +100,11 @@ def setup_commands(backend):
compile_commands = ['msbuild']
test_commands = ['msbuild', 'RUN_TESTS.vcxproj']
install_commands = []
+ elif backend == 'vs2015':
+ backend_flags = ['--backend=vs2015']
+ compile_commands = ['msbuild']
+ test_commands = ['msbuild', 'RUN_TESTS.vcxproj']
+ install_commands = []
elif backend == 'xcode' or (backend is None and mesonlib.is_osx()):
backend_flags = ['--backend=xcode']
compile_commands = ['xcodebuild']