From f2b9ec844f9dd4c524ab0a56959fab4e5c16b701 Mon Sep 17 00:00:00 2001
From: Bernie Hackett <bernie.hackett@gmail.com>
Date: Mon, 27 Feb 2017 09:58:20 -0800
Subject: [PATCH] PYTHON-1200 - Test CPython 2.6, 2.7, and 3.2 on Windows

---
 .evergreen/config.yml | 63 +++++++++++++------------------------------
 1 file changed, 18 insertions(+), 45 deletions(-)

diff --git a/.evergreen/config.yml b/.evergreen/config.yml
index 627467e5b..22080cd20 100644
--- a/.evergreen/config.yml
+++ b/.evergreen/config.yml
@@ -844,22 +844,6 @@ axes:
         display_name: InMemory
         variables:
            STORAGE_ENGINE: "inmemory"
-
-  #- id: windows-vs2008-python-version
-  #  display_name: "Windows Visual Studio 2008 Python"
-  #  values:
-  #    - id: "2.6"
-  #      display_name: "Python 2.6"
-  #      variables:
-  #         PYTHON_BINARY: "/cygdrive/c/python/Python26/python.exe"
-  #    - id: "2.7"
-  #      display_name: "Python 2.7"
-  #      variables:
-  #         PYTHON_BINARY: "/cygdrive/c/python/Python27/python.exe"
-  #    - id: "3.2"
-  #      display_name: "Python 3.2"
-  #      variables:
-  #         PYTHON_BINARY: "/cygdrive/c/python/Python32/python.exe"
   - id: windows-vs2010-python-version
     display_name: "Windows Visual Studio 2010 Python"
     values:
@@ -874,6 +858,21 @@ axes:
   - id: windows-vs2015-python-version
     display_name: "Windows Visual Studio 2015 Python"
     values:
+      # There is (currently) no vs2008 distro. The Microsoft Visual
+      # C++ Compiler for Python 2.7 has been installed, with CPython
+      # 2.6, 2.7, and 3.2, on the vs2015 distro.
+      - id: "2.6"
+        display_name: "Python 2.6"
+        variables:
+           PYTHON_BINARY: "/cygdrive/c/python/Python26/python.exe"
+      - id: "2.7"
+        display_name: "Python 2.7"
+        variables:
+           PYTHON_BINARY: "/cygdrive/c/python/Python27/python.exe"
+      - id: "3.2"
+        display_name: "Python 3.2"
+        variables:
+           PYTHON_BINARY: "/cygdrive/c/python/Python32/python.exe"
       - id: "3.5"
         display_name: "Python 3.5"
         variables:
@@ -1072,33 +1071,7 @@ buildvariants:
 
 # TODO: Figure out SSL on Windows.
 
-# Test Python 2.6, 2.7, and 3.2 against all versions on MongoDB >= 2.4
-# on Windows with Visual Studio 2008.
-#- matrix_name: "tests-windows-vs2008-python-version-nossl"
-#  matrix_spec: {"windows-vs2008-python-version": "*", auth: "*", ssl: "nossl" }
-#  display_name: "Windows 64 Visual Studio 2008 ${windows-vs2008-python-version} ${auth} ${ssl}"
-#  run_on: windows-64-vs2008-test
-#  tasks:
-#     - name: "test-latest-replica_set"
-#     - name: "test-latest-sharded_cluster"
-#     - name: "test-latest-standalone"
-#     - name: "test-3.4-replica_set"
-#     - name: "test-3.4-sharded_cluster"
-#     - name: "test-3.4-standalone"
-#     - name: "test-3.2-replica_set"
-#     - name: "test-3.2-sharded_cluster"
-#     - name: "test-3.2-standalone"
-#     - name: "test-3.0-replica_set"
-#     - name: "test-3.0-sharded_cluster"
-#     - name: "test-3.0-standalone"
-#     - name: "test-2.6-replica_set"
-#     - name: "test-2.6-sharded_cluster"
-#     - name: "test-2.6-standalone"
-#     - name: "test-2.4-replica_set"
-#     - name: "test-2.4-sharded_cluster"
-#     - name: "test-2.4-standalone"
-
-# Test Python 3.3 and 3.4 against all versions on MongoDB >= 2.4
+# Test CPython 3.3 and 3.4 against all versions on MongoDB >= 2.4
 # on Windows with Visual Studio 2010.
 - matrix_name: "tests-windows-vs2010-python-version-nossl"
   matrix_spec: {"windows-vs2010-python-version": "*", auth: "*", ssl: "nossl" }
@@ -1124,8 +1097,8 @@ buildvariants:
      - name: "test-2.4-sharded_cluster"
      - name: "test-2.4-standalone"
 
-# Test Python 3.5 and 3.6 against all versions on MongoDB >= 2.4
-# on Windows with Visual Studio 2015.
+# Test CPython 2.6, 2.7, 3.2, 3.5 and 3.6 against all versions on MongoDB >= 2.4
+# on Windows with the Microsoft Visual C++ Compiler for Python 2.7 or Visual Studio 2015.
 - matrix_name: "tests-windows-vs2015-python-version-nossl"
   matrix_spec: {"windows-vs2015-python-version": "*", auth: "*", ssl: "nossl" }
   display_name: "Windows 64 Visual Studio 2015 ${windows-vs2015-python-version} ${auth} ${ssl}"