Merge branch 'backport-ci-fedora-39' into ci-fedora-39

11 files changed, 19 insertions, 15 deletions

diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
index b61e62d..64a8885 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
@@ -1,4 +1,4 @@
-# prevent older policies from interfearing with this script
+# prevent older policies from interfering with this script
 cmake_policy(PUSH)
 cmake_policy(VERSION ${CMAKE_VERSION})
 
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
index 260a0f8..07281ed 100644
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
@@ -1,4 +1,4 @@
-# prevent older policies from interfearing with this script
+# prevent older policies from interfering with this script
 cmake_policy(PUSH)
 cmake_policy(VERSION ${CMAKE_VERSION})
 
diff --git a/Tests/CTestUpdateCVS.cmake.in b/Tests/CTestUpdateCVS.cmake.in
index 8e0b611..d3263c3 100644
--- a/Tests/CTestUpdateCVS.cmake.in
+++ b/Tests/CTestUpdateCVS.cmake.in
@@ -17,7 +17,7 @@ message("Using CVS tools:")
 set(CVS "@CVS_EXECUTABLE@")
 message(" cvs = ${CVS}")
 
-# Pre-pending :local: prevents cvs from trying to interpret Windows drive
+# Prepending :local: prevents cvs from trying to interpret Windows drive
 # letters, like "C:", as host names.
 set(REPO ":local:${TOP}/repo")
 
diff --git a/Tests/HIP/MathFunctions/main.hip b/Tests/HIP/MathFunctions/main.hip
index 8a6e77f..dae89fc 100644
--- a/Tests/HIP/MathFunctions/main.hip
+++ b/Tests/HIP/MathFunctions/main.hip
@@ -18,11 +18,15 @@ bool verify(F f, T expected)
 {
   std::unique_ptr<T> cpu_T(new T);
   T* gpu_T = nullptr;
-  hipMalloc((void**)&gpu_T, sizeof(T));
+  if (hipMalloc((void**)&gpu_T, sizeof(T)) != hipSuccess) {
+    return false;
+  }
+  bool result = true;
   hipLaunchKernelGGL(global_entry_point, 1, 1, 0, 0, f, gpu_T);
-  hipMemcpy(cpu_T.get(), gpu_T, sizeof(T), hipMemcpyDeviceToHost);
-  hipFree(gpu_T);
-  return (*cpu_T == expected);
+  result = hipMemcpy(cpu_T.get(), gpu_T, sizeof(T), hipMemcpyDeviceToHost) == hipSuccess && result;
+  result = hipFree(gpu_T) == hipSuccess && result;
+  result = *cpu_T == expected && result;
+  return result;
 }
 }
 
diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
index 6612375..c177447 100644
--- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake
@@ -12,7 +12,7 @@ endif()
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")
 
-# create an example error from address santizer
+# create an example error from address sanitizer
 
 file(APPEND "${LOG_FILE}.2343"
 "=================================================================
diff --git a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
index 4b5ef7e..9030009 100644
--- a/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testMemorySanitizer.cmake
@@ -12,7 +12,7 @@ endif()
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")
 
-# create an error of each type of thread santizer
+# create an error of each type of thread sanitizer
 # these names come from tsan_report.cc in llvm
 
 file(APPEND "${LOG_FILE}.2343"
diff --git a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
index 96251c3..29244b2 100644
--- a/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testThreadSanitizer.cmake
@@ -23,7 +23,7 @@ set(error_types
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")
 
-# create an error of each type of thread santizer
+# create an error of each type of thread sanitizer
 # these names come from tsan_report.cc in llvm
 foreach(error_type ${error_types} )
 
diff --git a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
index 7160280..77481b1 100644
--- a/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
+++ b/Tests/RunCMake/ctest_memcheck/testUndefinedBehaviorSanitizer.cmake
@@ -12,7 +12,7 @@ endif()
 # clear the log file
 file(REMOVE "${LOG_FILE}.2343")
 
-# create an error like undefined behavior santizer creates;
+# create an error like undefined behavior sanitizer creates;
 # these names come from ubsan_diag.cc and ubsan_handlers.cc
 # in llvm
 
diff --git a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt
index 317ed47..ded6b23 100644
--- a/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt
+++ b/Tests/UseSWIG/ModuleVersion2/CMakeLists.txt
@@ -39,7 +39,7 @@ if(CMake_TEST_FindPython2)
     COMMAND "${CMAKE_COMMAND}" -E env "PYTHONPATH=$<TARGET_PROPERTY:example1,SWIG_SUPPORT_FILES_DIRECTORY>${PS}$<TARGET_FILE_DIR:example1>"
     "${Python2_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/../runme.py")
 
-  # re-use sample interface file for another plugin
+  # reuse sample interface file for another plugin
   swig_add_library(example2
                    LANGUAGE python
                    SOURCES ../example.i ../example.cxx)
@@ -73,7 +73,7 @@ if(CMake_TEST_FindPython3)
     "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/../runme.py")
 
 
-  # re-use sample interface file for another plugin
+  # reuse sample interface file for another plugin
   swig_add_library(example4
                    LANGUAGE python
                    SOURCES ../example.i ../example.cxx)
diff --git a/Tests/UseSWIG/MultipleModules/CMakeLists.txt b/Tests/UseSWIG/MultipleModules/CMakeLists.txt
index 4380080..4db28d7 100644
--- a/Tests/UseSWIG/MultipleModules/CMakeLists.txt
+++ b/Tests/UseSWIG/MultipleModules/CMakeLists.txt
@@ -38,7 +38,7 @@ set_target_properties (example1 PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Python")
 target_link_libraries(example1 PRIVATE Python::Module)
 
-# re-use sample interface file for another plugin
+# reuse sample interface file for another plugin
 set_property(SOURCE "../example.i" APPEND PROPERTY
   GENERATED_INCLUDE_DIRECTORIES ${PERL_INCLUDE_PATH})
 separate_arguments(c_flags UNIX_COMMAND "${PERL_EXTRA_C_FLAGS}")
diff --git a/Tests/UseSWIG/MultiplePython/CMakeLists.txt b/Tests/UseSWIG/MultiplePython/CMakeLists.txt
index cf6c80e..0cb6f19 100644
--- a/Tests/UseSWIG/MultiplePython/CMakeLists.txt
+++ b/Tests/UseSWIG/MultiplePython/CMakeLists.txt
@@ -36,7 +36,7 @@ set_target_properties (example1 PROPERTIES
   RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Python2")
 target_link_libraries(example1 PRIVATE Python2::Module)
 
-# re-use sample interface file for another plugin
+# reuse sample interface file for another plugin
 swig_add_library(example2
                  LANGUAGE python
                  OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/Python3"