File riscv.patch of Package hdf5
From d4a5e1e4fb0445b03328be62c4b53e2a4a8e2d44 Mon Sep 17 00:00:00 2001
From: Larry Knox <lrknox@hdfgroup.org>
Date: Mon, 30 Dec 2024 13:57:29 -0600
Subject: [PATCH] Fix MPI_TEST_H5DIFF-h5diff_601 (#5192)
on Dane and Frontier, which occasionally fails when searching for expected output "Object could not
be found in <h5diff_basic1.h5>" when the object name </nono_obj> is
inserted after "Object". Search string is reduced to "could not
be found".
---
tools/test/h5diff/CMakeTests.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 5d36e0cd76..112d5066de 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -808,7 +808,7 @@ ADD_H5_TEST (h5diff_63 1 -v ${STRINGS1} ${STRINGS2} string4 string4)
ADD_H5_TEST (h5diff_600 1 ${FILE1})
# 6.1: Check if non-exist object name is specified
-ADD_H5_CMP_TEST (h5diff_601 2 "Object could not be found" ${FILE1} ${FILE1} nono_obj)
+ADD_H5_CMP_TEST (h5diff_601 2 "could not be found" ${FILE1} ${FILE1} nono_obj)
# ##############################################################################
# # -d
--
2.49.0
From 694e76170bc62d296a25b55034cba38d0c6bd752 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 4 Apr 2025 09:47:13 -0500
Subject: [PATCH] Correct fix for h5diff-601 tools test
---
tools/test/h5diff/CMakeTests.cmake | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 112d5066de..6d16772284 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -533,11 +533,9 @@
#-D "TEST_EXPECT=${resultcode}"
-D "TEST_EXPECT=0" # ph5diff currently always exits with a zero status code due to
# output from some MPI implementations from a non-zero exit code
- -D "TEST_REFERENCE=${resultfile}.txt"
- -D "TEST_ERRREF=${result_errcheck}"
+ -D "TEST_REFERENCE=${result_errcheck}"
-D "TEST_APPEND=EXIT CODE:"
-D "TEST_REF_APPEND=EXIT CODE: [0-9]"
- -D "TEST_REF_FILTER=EXIT CODE: 0"
-D "TEST_SORT_COMPARE=TRUE"
-P "${HDF_RESOURCES_DIR}/grepTest.cmake"
)
--
2.49.0
