More env fixes

Author: NoahStapp

.evergreen/config.yml

@@ -306,7 +306,7 @@ functions:
       params:
         working_dir: "src"
         binary: bash
-        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "test_serverless", "CRYPT_SHARED_LIB_PATH"]
+        include_expansions_in_env: ["AWS_ACCESS_KEY_ID", "AWS_SECRET_ACCESS_KEY", "AWS_SESSION_TOKEN", "TEST_DATA_LAKE", "TEST_INDEX_MANAGEMENT", "CRYPT_SHARED_LIB_PATH"]
         args:
           - .evergreen/scripts/run-with-env.sh
           - .evergreen/scripts/run-tests.sh

.evergreen/scripts/run-tests.sh

@@ -1,8 +1,5 @@
 #!/bin/bash
 
-TEST_INDEX_MANAGEMENT="${TEST_INDEX_MANAGEMENT:-}"
-TEST_DATA_LAKE="${TEST_DATA_LAKE:-}"
-
 if [ -n "${test_encryption}" ]; then
   ./.evergreen/hatch.sh encryption:setup &
 fi
@@ -41,7 +38,7 @@ fi
 if [ -n "${test_serverless}" ]; then
   export TEST_SERVERLESS=1
 fi
-if [ -n "${TEST_INDEX_MANAGEMENT}" ]; then
+if [ -n "${TEST_INDEX_MANAGEMENT:-}" ]; then
   export TEST_INDEX_MANAGEMENT=1
 fi
 if [ -n "${SKIP_CSOT_TESTS}" ]; then
@@ -55,7 +52,7 @@ GREEN_FRAMEWORK=${GREEN_FRAMEWORK} \
   COMPRESSORS=${COMPRESSORS} \
   AUTH=${AUTH} \
   SSL=${SSL} \
-  TEST_DATA_LAKE=${TEST_DATA_LAKE} \
+  TEST_DATA_LAKE=${TEST_DATA_LAKE:-} \
   TEST_SUITES=${TEST_SUITES} \
   MONGODB_API_VERSION=${MONGODB_API_VERSION} \
   SKIP_HATCH=${SKIP_HATCH} \

.evergreen/utils.sh

@@ -17,7 +17,7 @@ find_python3() {
         elif [ -d "/Library/Frameworks/Python.Framework/Versions/3.9" ]; then
             PYTHON="/Library/Frameworks/Python.Framework/Versions/3.9/bin/python3"
         fi
-    elif [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
+    elif [ "Windows_NT" = "${OS:-}" ]; then # Magic variable in cygwin
         PYTHON="C:/python/Python39/python.exe"
     else
         # Prefer our own toolchain, fall back to mongodb toolchain if it has Python 3.9+.
@@ -56,7 +56,7 @@ createvirtualenv () {
         # Workaround for bug in older versions of virtualenv.
         $VIRTUALENV $VENVPATH 2>/dev/null || $VIRTUALENV $VENVPATH
     fi
-    if [ "Windows_NT" = "$OS" ]; then
+    if [ "Windows_NT" = "${OS:-}" ]; then
         # Workaround https://bugs.python.org/issue32451:
         # mongovenv/Scripts/activate: line 3: $'\r': command not found
         dos2unix $VENVPATH/Scripts/activate || true