From 08addb85a2fd2c9efc4fd557112d519c044723eb Mon Sep 17 00:00:00 2001
From: gilbertlee-amd <44450918+gilbertlee-amd@users.noreply.github.com>
Date: Tue, 18 May 2021 12:56:30 -0600
Subject: [PATCH] Disabling env var caching for all unit tests (#371)

* Disabling env var caching for all unit tests

[ROCm/rccl commit: 2daadcc834f436619e7c9a1624e285e9ac0d8839]
---
 projects/rccl/test/CorrectnessTest.hpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/rccl/test/CorrectnessTest.hpp b/projects/rccl/test/CorrectnessTest.hpp
index 33f5b56058..8894ee3767 100644
--- a/projects/rccl/test/CorrectnessTest.hpp
+++ b/projects/rccl/test/CorrectnessTest.hpp
@@ -553,9 +553,10 @@ dropback:
 
             envString = 0;
             numTokens = 0;
+            setenv("RCCL_TEST_ENV_VARS", "ENABLE", 1);
             if (strcmp(envVals, "")) {
                 // enable RCCL env vars testing
-                setenv("RCCL_TEST_ENV_VARS", "ENABLE", 1);
+
                 envString = strdup(envVals);
                 tokens[numTokens] = strtok(envString, "=, ");
                 numTokens++;
@@ -802,9 +803,9 @@ dropback:
 
             envString = 0;
             numTokens = 0;
+            setenv("RCCL_TEST_ENV_VARS", "ENABLE", 1);
             if (strcmp(envVals, "")) {
                 // enable RCCL env vars testing
-                setenv("RCCL_TEST_ENV_VARS", "ENABLE", 1);
                 envString = strdup(envVals);
                 tokens[numTokens] = strtok(envString, "=, ");
                 numTokens++;