aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2014-06-24 19:20:44 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2014-06-24 19:20:44 +0300
commitb7bdf5b7bd68ed52580e546a7290065a1aba4343 (patch)
tree6d35a75cf3959de8b2cf1ec3a132a408713612eb
parent15128ab6bc4a51cd6c7698fc19613f7168807721 (diff)
downloadmeson-b7bdf5b7bd68ed52580e546a7290065a1aba4343.zip
meson-b7bdf5b7bd68ed52580e546a7290065a1aba4343.tar.gz
meson-b7bdf5b7bd68ed52580e546a7290065a1aba4343.tar.bz2
Prebuild object file with MSVC.
-rwxr-xr-xrun_tests.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/run_tests.py b/run_tests.py
index 5f3ee5d..71411b3 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -270,14 +270,15 @@ def generate_prebuilt_object():
objectbase = 'test cases/prebuilt object/1 basic/prebuilt.'
if shutil.which('cl'):
objectfile = objectbase + 'obj'
- raise RuntimeError('MSVC compilation not done yet.')
+ cmd = ['cl', '/nologo', '/Fo'+objectfile, '/c', source]
else:
if is_windows():
objectfile = objectbase + 'obj'
else:
objectfile = objectbase + 'o'
- subprocess.check_call(['cc', '-c', source, '-o', objectfile])
- return objectfile
+ cmd = ['cc', '-c', source, '-o', objectfile]
+ subprocess.check_call(cmd)
+ return objectfile
if __name__ == '__main__':
script_dir = os.path.split(__file__)[0]