Merge remote-tracking branch 'origin/develop' into threading_updates

qkoziol · Mar 27, 2024 · aae5e79 · aae5e79
2 parents 1fbb458 + ce3784d
commit aae5e79
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/cygwin-auto.yml b/.github/workflows/cygwin-auto.yml
@@ -15,6 +15,7 @@ jobs:
   cygwin_build_and_test:
     name: "cygwin ${{ inputs.build_mode }}"
     runs-on: windows-latest
+    timeout-minutes: 30
     steps:
       - name: Set git to use LF
         run: |

diff --git a/.github/workflows/cygwin-cmake.yml b/.github/workflows/cygwin-cmake.yml
@@ -15,6 +15,7 @@ jobs:
   cygwin_build_and_test:
     name: "cygwin-${{ inputs.build_mode }}"
     runs-on: windows-latest
+    timeout-minutes: 30
     steps:
       - name: Set git to use LF
         run: |

diff --git a/fortran/test/tH5T.F90 b/fortran/test/tH5T.F90
@@ -941,7 +941,7 @@ END SUBROUTINE enumtest
 !-------------------------------------------------------------------------
 ! * Function:    test_derived_flt
 ! *
-! * Purpose:     Tests user-define and query functions of floating-point types.
+! * Purpose:     Tests user-defined and query functions of floating-point types.
 ! *              test h5tget/set_fields_f.
 ! *
 ! * Return:      Success:        0

diff --git a/test/dt_arith.c b/test/dt_arith.c
@@ -878,7 +878,7 @@ test_particular_fp_integer(void)
 /*-------------------------------------------------------------------------
  * Function:    test_derived_flt
  *
- * Purpose:     Tests user-define and query functions of floating-point types.
+ * Purpose:     Tests user-defined and query functions of floating-point types.
  *
  * Return:      Success:        0
  *
@@ -903,7 +903,7 @@ test_derived_flt(void)
     char           str[256];             /*message string    */
     unsigned int   i, j;
 
-    TESTING("user-define and query functions of floating-point types");
+    TESTING("user-defined and query functions of floating-point types");
 
     /* Create File */
     h5_fixname(FILENAME[0], H5P_DEFAULT, filename, sizeof filename);
@@ -1324,7 +1324,7 @@ test_derived_flt(void)
 /*-------------------------------------------------------------------------
  * Function:    test_derived_integer
  *
- * Purpose:     Tests user-define and query functions of integer types.
+ * Purpose:     Tests user-defined and query functions of integer types.
  *
  * Return:      Success:        0
  *
@@ -1347,7 +1347,7 @@ test_derived_integer(void)
     char           str[256];             /*message string    */
     unsigned int   i, j;
 
-    TESTING("user-define and query functions of integer types");
+    TESTING("user-defined and query functions of integer types");
 
     /* Create File */
     h5_fixname(FILENAME[1], H5P_DEFAULT, filename, sizeof filename);
@@ -5990,11 +5990,11 @@ main(void)
     /* Test H5Tcompiler_conv() for querying hard conversion. */
     nerrors += (unsigned long)test_hard_query();
 
-    /* Test user-define, query functions and software conversion
+    /* Test user-defined, query functions and software conversion
      * for user-defined floating-point types */
     nerrors += (unsigned long)test_derived_flt();
 
-    /* Test user-define, query functions and software conversion
+    /* Test user-defined, query functions and software conversion
      * for user-defined integer types */
     nerrors += (unsigned long)test_derived_integer();