WIP: Fix unseekable file test on Cygwin

mattjala · Sep 3, 2024 · 5f55b31 · 5f55b31
1 parent a08e534
commit 5f55b31
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/cyg-ninja-sh-ompi.yml b/.github/workflows/cyg-ninja-sh-ompi.yml
@@ -27,5 +27,5 @@ jobs:
            -D BUILD_SHARED_LIBS:BOOL=OFF \
            -D CTEST_DROP_SITE_INIT:STRING="my.cdash.org" \
            ..
-          ctest -D Experimental
+          ctest -D Experimental --output-on-failure -VV
         shell: C:\cygwin\bin\bash.exe -eo pipefail -o igncr '{0}'
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
@@ -20,6 +20,9 @@
 /* Define if using MinGW */
 #cmakedefine H5_HAVE_MINGW @H5_HAVE_MINGW@
 
+/* Define if using Cygwin */
+#cmakedefine H5_HAVE_CYGWIN @CYGWIN@
+
 /* Define if on the Windows platform and using the Win32 API */
 #cmakedefine H5_HAVE_WIN32_API @H5_HAVE_WIN32_API@
 

diff --git a/test/tfile.c b/test/tfile.c
@@ -8110,32 +8110,45 @@ test_min_dset_ohdr(void)
 static void
 test_unseekable_file(void)
 {
+    hid_t file_id = H5I_INVALID_HID;
+
     /* Output message about test being performed */
-    MESSAGE(5, ("Testing creating/opening an unseekable file\n"));
+    MESSAGE(0, ("Testing creating/opening an unseekable file\n"));
+#ifdef H5_HAVE_WIN32_API
+    MESSAGE(0, (" Have win32 API"));
+#else
+    MESSAGE(0, (" Don't have win32 API"));
+#endif
+
+#ifdef H5_HAVE_CYGWIN
+    MESSAGE(0, (" Have CYGWIN"));
+#endif
+
+#ifdef __CYGWIN__
+    MESSAGE(0, (" Have __CYGWIN__"));
+#endif
 
     /* Flush message in case this test segfaults */
     fflush(stdout);
 
     /* Creation */
-#ifdef H5_HAVE_WIN32_API
+#if (defined(H5_HAVE_WIN32_API) && !defined(H5_HAVE_CYGWIN))
     H5Fcreate("NUL", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 #else
     H5Fcreate("/dev/null", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 #endif
 
     /* Should fail without segfault */
-    /* TODO - Does not properly fail on all systems */
-    /* VERIFY(file_id, H5I_INVALID_HID, "H5Fcreate"); */
+    VERIFY(file_id, H5I_INVALID_HID, "H5Fcreate");
 
     /* Opening */
-#ifdef H5_HAVE_WIN32_API
+#if (defined(H5_HAVE_WIN32_API) && !defined(H5_HAVE_CYGWIN))
     H5Fopen("NUL", H5F_ACC_RDWR, H5P_DEFAULT);
 #else
     H5Fopen("/dev/null", H5F_ACC_RDWR, H5P_DEFAULT);
 #endif
 
-    /* TODO - Does not properly fail on all systems */
-    /* VERIFY(file_id, H5I_INVALID_HID, "H5Fopen"); */
+    VERIFY(file_id, H5I_INVALID_HID, "H5Fopen");
 }
 /****************************************************************
 **