[HotFix] Env Var set conflicts between #2543 and #2514 (#2571)

ROCm · Nov 30, 2023 · 295a9b3 · 295a9b3
1 parent 8605896
commit 295a9b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,5 +1,5 @@
 def rocmnode(name) {
-    return 'rocmtest && miopen && (' + name + ')'
+    return '(rocmtest || miopen) && (' + name + ')'
 }
 
 def miopenCheckout()

diff --git a/test/gtest/sum.cpp b/test/gtest/sum.cpp
@@ -23,16 +23,20 @@
  * SOFTWARE.
  *
  *******************************************************************************/
+#include <miopen/env.hpp>
 #include "sum.hpp"
 
+MIOPEN_DECLARE_ENV_VAR_STR(MIOPEN_TEST_FLOAT_ARG)
+MIOPEN_DECLARE_ENV_VAR_BOOL(MIOPEN_TEST_ALL)
+
 std::string GetFloatArg()
 {
-    static const auto tmp = miopen::GetEnv("MIOPEN_TEST_FLOAT_ARG");
+    const auto& tmp = miopen::GetStringEnv(ENV(MIOPEN_TEST_FLOAT_ARG));
     if(tmp.empty())
     {
         return "";
     }
-    return tmp.front();
+    return tmp;
 }
 
 struct SumTestFloat : SumTest<float>
@@ -41,7 +45,7 @@ struct SumTestFloat : SumTest<float>
 
 TEST_P(SumTestFloat, SumTestFw)
 {
-    if(miopen::IsEnvvarValueEnabled("MIOPEN_TEST_ALL") && (GetFloatArg() == "--float"))
+    if(miopen::IsEnabled(ENV(MIOPEN_TEST_ALL)) && (GetFloatArg() == "--float"))
     {
         RunTest();
         Verify();