summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Brill <48932340+jcbrill@users.noreply.github.com>2020-07-02 11:26:29 (GMT)
committerJoseph Brill <48932340+jcbrill@users.noreply.github.com>2020-07-02 11:26:29 (GMT)
commit5a03413aed716ee15f4592cb5bc61f4d128dc26f (patch)
tree33c4b51c0663de10f44753d9672e206607e2bba4
parent25d846717f2b664e6ee2e77bb7ff04a8d4438388 (diff)
downloadSCons-5a03413aed716ee15f4592cb5bc61f4d128dc26f.zip
SCons-5a03413aed716ee15f4592cb5bc61f4d128dc26f.tar.gz
SCons-5a03413aed716ee15f4592cb5bc61f4d128dc26f.tar.bz2
Back out changes to test/MSVS/common-prefix.py and update CHANGES.txt.
-rwxr-xr-xCHANGES.txt1
-rw-r--r--test/MSVS/common-prefix.py6
2 files changed, 0 insertions, 7 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index af6e3be..51a40c8 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -43,7 +43,6 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
- Test update: Reduce the number of "false negative" test failures for the interactive
configuration test (test/interactive/configure.py).
- MSVS update: Fix the development environment path for MSVS 7.0.
- - Test update: Add an MSVS version check for 8.0 in the MSVS/common_prefix.py test.
From William Deegan:
- Fix broken clang + MSVC 2019 combination by using MSVC configuration logic to
diff --git a/test/MSVS/common-prefix.py b/test/MSVS/common-prefix.py
index 5408e51..7079661 100644
--- a/test/MSVS/common-prefix.py
+++ b/test/MSVS/common-prefix.py
@@ -41,12 +41,6 @@ if sys.platform != 'win32':
msg = "Skipping Visual Studio test on non-Windows platform '%s'\n" % sys.platform
test.skip_test(msg)
-msvs_version = '8.0'
-
-if msvs_version not in test.msvs_versions():
- msg = "Visual Studio %s not installed; skipping test.\n" % msvs_version
- test.skip_test(msg)
-
vcproj_template = """\
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject