From 3327dd6a6f4345607f9a72eaed59f74b06c39d25 Mon Sep 17 00:00:00 2001 From: Joseph Brill <48932340+jcbrill@users.noreply.github.com> Date: Sat, 27 Jun 2020 08:28:42 -0400 Subject: Swap the argument order for DummyVsWhere to match the signature of find_vc_pdir_vswhere in vc.py. --- test/fixture/no_msvc/no_msvcs_sconstruct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixture/no_msvc/no_msvcs_sconstruct.py b/test/fixture/no_msvc/no_msvcs_sconstruct.py index 11a06ac..18366d8 100644 --- a/test/fixture/no_msvc/no_msvcs_sconstruct.py +++ b/test/fixture/no_msvc/no_msvcs_sconstruct.py @@ -1,7 +1,7 @@ import SCons import SCons.Tool.MSCommon -def DummyVsWhere(env, msvc_version): +def DummyVsWhere(msvc_version, env): # not testing versions with vswhere, so return none return None -- cgit v0.12 From d5f805cd9890123afa10f230024473d3003667b9 Mon Sep 17 00:00:00 2001 From: Joseph Brill <48932340+jcbrill@users.noreply.github.com> Date: Sat, 27 Jun 2020 17:10:06 -0400 Subject: Add "#include " to generated c code to prevent build failures on x86 for MSVS 2015+. --- test/MSVS/vs-14.0-exec.py | 1 + test/MSVS/vs-14.0Exp-exec.py | 1 + test/MSVS/vs-14.1-exec.py | 1 + test/MSVS/vs-14.2-exec.py | 1 + 4 files changed, 4 insertions(+) diff --git a/test/MSVS/vs-14.0-exec.py b/test/MSVS/vs-14.0-exec.py index 1d5b9bc..7e919ba 100644 --- a/test/MSVS/vs-14.0-exec.py +++ b/test/MSVS/vs-14.0-exec.py @@ -81,6 +81,7 @@ env.Program('foo.c') """ % locals()) test.write(['sub dir', 'foo.c'], r""" +#include int main(int argc, char *argv) { diff --git a/test/MSVS/vs-14.0Exp-exec.py b/test/MSVS/vs-14.0Exp-exec.py index cb4aaf3..5d2a585 100644 --- a/test/MSVS/vs-14.0Exp-exec.py +++ b/test/MSVS/vs-14.0Exp-exec.py @@ -77,6 +77,7 @@ env.Program('foo.c') """ % locals()) test.write(['sub dir', 'foo.c'], r""" +#include int main(int argc, char *argv) { diff --git a/test/MSVS/vs-14.1-exec.py b/test/MSVS/vs-14.1-exec.py index bcf4fbe..2accaaf 100644 --- a/test/MSVS/vs-14.1-exec.py +++ b/test/MSVS/vs-14.1-exec.py @@ -81,6 +81,7 @@ env.Program('foo.c') """ % locals()) test.write(['sub dir', 'foo.c'], r""" +#include int main(int argc, char *argv) { diff --git a/test/MSVS/vs-14.2-exec.py b/test/MSVS/vs-14.2-exec.py index 1894031..5a3079d 100644 --- a/test/MSVS/vs-14.2-exec.py +++ b/test/MSVS/vs-14.2-exec.py @@ -81,6 +81,7 @@ env.Program('foo.c') """ % locals()) test.write(['sub dir', 'foo.c'], r""" +#include int main(int argc, char *argv) { -- cgit v0.12 From 568c24e22d5b185021382adeb828ca385c4b3aa2 Mon Sep 17 00:00:00 2001 From: Joseph Brill <48932340+jcbrill@users.noreply.github.com> Date: Sat, 27 Jun 2020 17:14:15 -0400 Subject: Add changes for MSVS 2015+ generated project/solution tests on x86. --- CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 020e17b..e4144db 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -38,6 +38,8 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER (GH Issue #3699). - MSVC updates: An MSVC 6.0 installation now appears in the installed versions list when msvc debug output is enabled (GH Issue #3699). + - MSVS test updates: Tests for building a program using generated MSVS project and + solution files using MSVS 2015 and later now work as expected on x86 hosts. From William Deegan: - Fix broken clang + MSVC 2019 combination by using MSVC configuration logic to -- cgit v0.12