From 31b8b2faf90a79e069761b12deac8525cd4c0aa1 Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Fri, 24 May 2024 19:25:00 -0400
Subject: [PATCH] ci: fix perftest uploading

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

diff --git a/CMake/testing/VTKmPerformanceTest.cmake b/CMake/testing/VTKmPerformanceTest.cmake
index 3aed96b5c..728413c72 100644
--- a/CMake/testing/VTKmPerformanceTest.cmake
+++ b/CMake/testing/VTKmPerformanceTest.cmake
@@ -76,14 +76,6 @@ 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##########################################################
@@ -125,7 +117,12 @@ function(add_benchmark_test benchmark)
     -P "${VTKm_SOURCE_DIR}/CMake/testing/VTKmPerformanceTestReport.cmake"
     )
 
-  if (enable_upload)
+
+  # 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})
     add_test(NAME "${test_name}Upload"
       COMMAND ${CMAKE_COMMAND}
       "-DVTKm_PERF_REPO=${VTKm_PERF_REPO}"