From 1078d7dfb4b79d6391bda6bfdde70b997144dd19 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Fri, 21 Jun 2024 12:31:24 -0400
Subject: [PATCH 1/2] Revert "ci: fix perftest uploading"

This reverts commit 31b8b2faf90a79e069761b12deac8525cd4c0aa1.

(cherry picked from commit cdd3a55f61850c4438a0b0f890bc6e3f11c641fb)
---
 CMake/testing/VTKmPerformanceTest.cmake | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/CMake/testing/VTKmPerformanceTest.cmake b/CMake/testing/VTKmPerformanceTest.cmake
index 728413c72..3aed96b5c 100644
--- a/CMake/testing/VTKmPerformanceTest.cmake
+++ b/CMake/testing/VTKmPerformanceTest.cmake
@@ -76,6 +76,14 @@ function(add_benchmark_test benchmark)
     set(VTKm_PERF_COMPARE_JSON "${CMAKE_BINARY_DIR}/$ENV{CI_COMMIT_SHA}_${VTKm_PERF_NAME}.json")
   endif()
 
+  # Only upload when we are inside a CI build and in master.  We need to check
+  # if VTKM_BENCH_RECORDS_TOKEN is either defined or non-empty, the reason is
+  # that in Gitlab CI Variables for protected branches are also defined in MR
+  # from forks, however, they are empty.
+  if (DEFINED ENV{VTKM_BENCH_RECORDS_TOKEN} AND ENV{VTKM_BENCH_RECORDS_TOKEN})
+    set(enable_upload TRUE)
+  endif()
+
   set(test_name "PerformanceTest${VTKm_PERF_NAME}")
 
   ###TEST INVOKATIONS##########################################################
@@ -117,12 +125,7 @@ function(add_benchmark_test benchmark)
     -P "${VTKm_SOURCE_DIR}/CMake/testing/VTKmPerformanceTestReport.cmake"
     )
 
-
-  # Only upload when we are inside a CI build and in master.  We need to check
-  # if VTKM_BENCH_RECORDS_TOKEN is non-empty, the reason is that in Gitlab CI
-  # Variables for protected branches are also defined in MR from forks,
-  # however, they are empty.
-  if ($ENV{VTKM_BENCH_RECORDS_TOKEN})
+  if (enable_upload)
     add_test(NAME "${test_name}Upload"
       COMMAND ${CMAKE_COMMAND}
       "-DVTKm_PERF_REPO=${VTKm_PERF_REPO}"

From 638d18356774362f5b9d6302458c69692ecfb1a7 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Fri, 21 Jun 2024 12:32:29 -0400
Subject: [PATCH 2/2] fix: perftest upload

(cherry picked from commit 76ddf7a5b2836cf4153e36f28dd2675f5ef8a735)
---
 CMake/testing/VTKmPerformanceTest.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMake/testing/VTKmPerformanceTest.cmake b/CMake/testing/VTKmPerformanceTest.cmake
index 3aed96b5c..44407cf8d 100644
--- a/CMake/testing/VTKmPerformanceTest.cmake
+++ b/CMake/testing/VTKmPerformanceTest.cmake
@@ -80,7 +80,7 @@ function(add_benchmark_test benchmark)
   # if VTKM_BENCH_RECORDS_TOKEN is either defined or non-empty, the reason is
   # that in Gitlab CI Variables for protected branches are also defined in MR
   # from forks, however, they are empty.
-  if (DEFINED ENV{VTKM_BENCH_RECORDS_TOKEN} AND ENV{VTKM_BENCH_RECORDS_TOKEN})
+  if (DEFINED ENV{VTKM_BENCH_RECORDS_TOKEN} AND NOT $ENV{VTKM_BENCH_RECORDS_TOKEN} STREQUAL "")
     set(enable_upload TRUE)
   endif()