Sync develop changes to hdf5_1_14

.github/workflows/hdfeos5.yml

@@ -0,0 +1,51 @@
+name: hdfeos5 1.14
+
+# Triggers the workflow on push or pull request or on demand
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+    branches: [ hdf5_1_14 ]
+    paths-ignore:
+      - '.github/CODEOWNERS'
+      - '.github/FUNDING.yml'
+      - 'doc/**'
+      - 'release_docs/**'
+      - 'ACKNOWLEDGEMENTS'
+      - 'COPYING**'
+      - '**.md'
+
+# Using concurrency to cancel any in-progress job or run
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref && github.ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: Build hdfeos5
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4.1.7
+
+      - name: Install Autotools Dependencies (Linux)
+        run: |
+          sudo apt update
+          sudo apt install automake autoconf libtool libtool-bin
+      - name: Install HDF5
+        run: |
+          ./autogen.sh
+          ./configure --prefix=/usr/local --disable-tests --with-default-api-version=v16
+          make
+          sudo make install
+      - name: Install HDF-EOS5
+        run: |
+          wget -O HDF-EOS5.2.0.tar.gz "https://git.earthdata.nasa.gov/projects/DAS/repos/hdfeos5/raw/hdf-eos5-2.0-src.tar.gz?at=refs%2Fheads%2FHDFEOS5_2.0"
+          tar zxvf HDF-EOS5.2.0.tar.gz
+          cd hdf-eos5-2.0
+          ./configure CC=/usr/local/bin/h5cc --prefix=/usr/local/ --enable-install-include
+          make
+          make check
+          sudo make install

CMakeLists.txt

@@ -159,6 +159,7 @@ set (HDF5_LIB_BASE              "hdf5")
 
 set (HDF5_LIB_CORE              "")
 set (HDF5_TEST_LIB_CORE         "_test")
+set (HDF5_TEST_PAR_LIB_CORE     "_testpar")
 set (HDF5_CPP_LIB_CORE          "_cpp")
 set (HDF5_HL_LIB_CORE           "_hl")
 set (HDF5_HL_CPP_LIB_CORE       "_hl_cpp")
@@ -174,6 +175,7 @@ set (HDF5_JAVA_JNI_LIB_CORE     "_java")
 
 set (HDF5_LIB_CORENAME              "${HDF5_LIB_BASE}")
 set (HDF5_TEST_LIB_CORENAME         "${HDF5_LIB_BASE}${HDF5_TEST_LIB_CORE}")
+set (HDF5_TEST_PAR_LIB_CORENAME     "${HDF5_LIB_BASE}${HDF5_TEST_PAR_LIB_CORE}")
 set (HDF5_CPP_LIB_CORENAME          "${HDF5_LIB_BASE}${HDF5_CPP_LIB_CORE}")
 set (HDF5_HL_LIB_CORENAME           "${HDF5_LIB_BASE}${HDF5_HL_LIB_CORE}")
 set (HDF5_HL_CPP_LIB_CORENAME       "${HDF5_LIB_BASE}${HDF5_HL_CPP_LIB_CORE}")
@@ -194,6 +196,7 @@ set (HDF5_JAVA_TEST_LIB_CORENAME    "jartest5")
 #-----------------------------------------------------------------------------
 set (HDF5_LIB_NAME              "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
 set (HDF5_TEST_LIB_NAME         "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_TEST_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
+set (HDF5_TEST_PAR_LIB_NAME     "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_TEST_PAR_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
 set (HDF5_CPP_LIB_NAME          "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_CPP_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
 set (HDF5_HL_LIB_NAME           "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_HL_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
 set (HDF5_HL_CPP_LIB_NAME       "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_LIB_BASE}${HDF5_LIB_INFIX}${HDF5_HL_CPP_LIB_CORE}${HDF5_EXTERNAL_LIB_SUFFIX}")
@@ -216,6 +219,7 @@ set (HDF5_JAVA_TEST_LIB_NAME    "${HDF5_EXTERNAL_LIB_PREFIX}${HDF5_JAVA_TEST_LIB
 #-----------------------------------------------------------------------------
 set (HDF5_LIB_TARGET              "${HDF5_LIB_CORENAME}-static")
 set (HDF5_TEST_LIB_TARGET         "${HDF5_TEST_LIB_CORENAME}-static")
+set (HDF5_TEST_PAR_LIB_TARGET     "${HDF5_TEST_PAR_LIB_CORENAME}-static")
 set (HDF5_CPP_LIB_TARGET          "${HDF5_CPP_LIB_CORENAME}-static")
 set (HDF5_HL_LIB_TARGET           "${HDF5_HL_LIB_CORENAME}-static")
 set (HDF5_HL_CPP_LIB_TARGET       "${HDF5_HL_CPP_LIB_CORENAME}-static")
@@ -232,6 +236,7 @@ set (HDF5_JAVA_HDF5_LIB_TARGET    "${HDF5_JAVA_HDF5_LIB_CORENAME}")
 set (HDF5_JAVA_TEST_LIB_TARGET    "${HDF5_JAVA_TEST_LIB_CORENAME}")
 set (HDF5_LIBSH_TARGET            "${HDF5_LIB_CORENAME}-shared")
 set (HDF5_TEST_LIBSH_TARGET       "${HDF5_TEST_LIB_CORENAME}-shared")
+set (HDF5_TEST_PAR_LIBSH_TARGET   "${HDF5_TEST_PAR_LIB_CORENAME}-shared")
 set (HDF5_CPP_LIBSH_TARGET        "${HDF5_CPP_LIB_CORENAME}-shared")
 set (HDF5_HL_LIBSH_TARGET         "${HDF5_HL_LIB_CORENAME}-shared")
 set (HDF5_HL_CPP_LIBSH_TARGET     "${HDF5_HL_CPP_LIB_CORENAME}-shared")

bin/genparser

@@ -200,14 +200,14 @@ if [ "$verbose" = true ] ; then
 fi
 ${HDF5_FLEX} --nounistd -PH5LTyy -o ${path_to_hl_src}/H5LTanalyze.c ${path_to_hl_src}/H5LTanalyze.l
 
-# fix H5LTparse.c and H5LTlparse.h to declare H5LTyyparse return type as an
-# hid_t instead of int.  Currently the generated function H5LTyyparse is
-# generated with a return value of type int, which is a mapping to the
+# Fix H5LTparse.c and H5LTparse.h to declare H5LTyyparse return type as an
+# hid_t instead of int.  Currently, the H5LTyyparse function is generated
+# with a return value of type int, which is a mapping to the
 # flex yyparse function.  The return value in the HL library should be
 # an hid_t.
-# I propose to not use flex to generate this function, but for now I am
-# adding a perl command to find and replace this function declaration in
-# H5LTparse.c.
+# Use Perl command to find and replace this function declaration
+# in H5LTparse.c. This is a temporary solution until a method that does not
+# use flex is implemented.
 perl -0777 -pi -e 's/int yyparse/hid_t yyparse/igs' ${path_to_hl_src}/H5LTparse.c
 perl -0777 -pi -e 's/int\nyyparse/hid_t\nyyparse/igs' ${path_to_hl_src}/H5LTparse.c
 perl -0777 -pi -e 's/int H5LTyyparse/hid_t H5LTyyparse/igs' ${path_to_hl_src}/H5LTparse.c

c++/test/dsets.cpp

@@ -1451,7 +1451,7 @@ test_read_string(H5File &file)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dset()
+test_dset(const void *params)
 {
     hid_t fapl_id;
     fapl_id     = h5_fileaccess(); // in h5test.c, returns a file access template
@@ -1492,9 +1492,6 @@ test_dset()
     catch (Exception &E) {
         test_report(nerrors, H5std_string(" Dataset"));
     }
-
-    // Clean up data file
-    cleanup_dsets();
 } // test_dset
 
 /*-------------------------------------------------------------------------
@@ -1506,8 +1503,10 @@ test_dset()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-cleanup_dsets()
+cleanup_dsets(void *params)
 {
-    HDremove(FILE1.c_str());
-    HDremove(FILE_ACCPLIST.c_str());
+    if (GetTestCleanup()) {
+        HDremove(FILE1.c_str());
+        HDremove(FILE_ACCPLIST.c_str());
+    }
 } // cleanup_dsets

c++/test/h5cpputil.h

@@ -22,15 +22,16 @@
 #define H5cpputil_H
 
 #include "h5test.h"
+#include "testframe.h"
 
 using namespace H5;
 using std::cerr;
 using std::endl;
 
 #define MESSAGE(V, A)                                                                                        \
     do {                                                                                                     \
-        if (HDGetTestVerbosity() > (V))                                                                      \
-            print_func A;                                                                                    \
+        if (GetTestVerbosity() > (V))                                                                        \
+            printf A;                                                                                        \
     } while (0)
 #define SUBTEST(TEST)                                                                                        \
     do {                                                                                                     \
@@ -142,36 +143,36 @@ verify_val(Type1 x, Type2 value, float epsilon, const char *msg, int line, const
 #ifdef __cplusplus
 extern "C" {
 #endif
-void test_array();
-void test_attr();
-void test_compound();
-void test_dsproplist();
-void test_file();
-void test_filters();
-void test_links();
-void test_h5s();
-void test_iterate();
-void test_object();
-void test_reference();
-void test_types();
-void test_vlstrings();
-void test_dset();
+void test_array(const void *params);
+void test_attr(const void *params);
+void test_compound(const void *params);
+void test_dsproplist(const void *params);
+void test_file(const void *params);
+void test_filters(const void *params);
+void test_links(const void *params);
+void test_h5s(const void *params);
+void test_iterate(const void *params);
+void test_object(const void *params);
+void test_reference(const void *params);
+void test_types(const void *params);
+void test_vlstrings(const void *params);
+void test_dset(const void *params);
 
 /* Prototypes for the cleanup routines */
-void cleanup_array();
-void cleanup_attr();
-void cleanup_compound();
-void cleanup_dsproplist();
-void cleanup_dsets();
-void cleanup_file();
-void cleanup_filters();
-void cleanup_h5s();
-void cleanup_iterate();
-void cleanup_links();
-void cleanup_object();
-void cleanup_reference();
-void cleanup_types();
-void cleanup_vlstrings();
+void cleanup_array(void *params);
+void cleanup_attr(void *params);
+void cleanup_compound(void *params);
+void cleanup_dsproplist(void *params);
+void cleanup_dsets(void *params);
+void cleanup_file(void *params);
+void cleanup_filters(void *params);
+void cleanup_h5s(void *params);
+void cleanup_iterate(void *params);
+void cleanup_links(void *params);
+void cleanup_object(void *params);
+void cleanup_reference(void *params);
+void cleanup_types(void *params);
+void cleanup_vlstrings(void *params);
 
 #ifdef __cplusplus
 }

c++/test/tarray.cpp

@@ -477,7 +477,7 @@ test_array_info()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_array()
+test_array(const void *params)
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Array Datatypes\n"));
@@ -502,7 +502,9 @@ test_array()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-cleanup_array()
+cleanup_array(void *params)
 {
-    HDremove(FILENAME.c_str());
+    if (GetTestCleanup()) {
+        HDremove(FILENAME.c_str());
+    }
 } // cleanup_array

c++/test/tattr.cpp

@@ -1956,7 +1956,7 @@ test_attr_corder_create_basic(FileCreatPropList &fcpl, FileAccPropList &fapl)
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_attr()
+test_attr(const void *params)
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Attributes\n"));
@@ -2041,12 +2041,14 @@ test_attr()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-cleanup_attr()
+cleanup_attr(void *params)
 {
-    HDremove(FILE_BASIC.c_str());
-    HDremove(FILE_COMPOUND.c_str());
-    HDremove(FILE_SCALAR.c_str());
-    HDremove(FILE_MULTI.c_str());
-    HDremove(FILE_DTYPE.c_str());
-    HDremove(FILE_CRTPROPS.c_str());
+    if (GetTestCleanup()) {
+        HDremove(FILE_BASIC.c_str());
+        HDremove(FILE_COMPOUND.c_str());
+        HDremove(FILE_SCALAR.c_str());
+        HDremove(FILE_MULTI.c_str());
+        HDremove(FILE_DTYPE.c_str());
+        HDremove(FILE_CRTPROPS.c_str());
+    }
 }

c++/test/tcompound.cpp

@@ -729,7 +729,7 @@ test_compound_set_size()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_compound()
+test_compound(const void *params)
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Compound Data Type operations\n"));
@@ -753,7 +753,9 @@ test_compound()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-cleanup_compound()
+cleanup_compound(void *params)
 {
-    HDremove(COMPFILE.c_str());
+    if (GetTestCleanup()) {
+        HDremove(COMPFILE.c_str());
+    }
 } // cleanup_file

c++/test/tdspl.cpp

@@ -114,7 +114,7 @@ test_transfplist()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-test_dsproplist()
+test_dsproplist(const void *params)
 {
     // Output message about test being performed
     MESSAGE(5, ("Testing Generic Dataset Property Lists\n"));
@@ -132,7 +132,9 @@ test_dsproplist()
  *-------------------------------------------------------------------------
  */
 extern "C" void
-cleanup_dsproplist()
+cleanup_dsproplist(void *params)
 {
-    HDremove(FILENAME.c_str());
+    if (GetTestCleanup()) {
+        HDremove(FILENAME.c_str());
+    }
 }