Rewrite DirEnt test to use non-portable-tests flag

Author: hasufell

.github/workflows/ci.yml

@@ -57,7 +57,7 @@ jobs:
         cabal sdist -z -o .
         cabal get unix-*.tar.gz
         cd unix-*/
-        cabal test all --test-show-details=direct
+        cabal test -f+non-portable-tests all --test-show-details=direct
     - name: Haddock
       run: |
         cabal haddock --disable-documentation
@@ -85,7 +85,7 @@ jobs:
         cabal update
         autoreconf --version
         autoreconf -i
-        cabal test all --test-show-details=direct
+        cabal test -f+non-portable-tests all --test-show-details=direct
 
   fedora37:
     runs-on: ubuntu-latest
@@ -110,7 +110,7 @@ jobs:
         autoreconf --version
         autoreconf -i
         # test filepath >= 1.5
-        cabal test --constraint='filepath >= 1.5.0.0' all --test-show-details=direct
+        cabal test -f+non-portable-tests --constraint='filepath >= 1.5.0.0' all --test-show-details=direct
 
   i386:
     runs-on: ubuntu-latest
@@ -182,5 +182,5 @@ jobs:
           cabal sdist -z -o .
           cabal get unix-*.tar.gz
           cd unix-*/
-          cabal test all --test-show-details=direct
+          cabal test -f+non-portable-tests all --test-show-details=direct
 

configure.ac

@@ -65,66 +65,6 @@ FP_CHECK_CONST([DT_WHT], [
 #include <dirent.h>
 #endif], [-9])
 
-AC_LANG(C)
-AC_MSG_CHECKING(whether kernel returns a useful d_type)
-AC_RUN_IFELSE(
-  [AC_LANG_SOURCE([[
-#if HAVE_STRUCT_DIRENT_D_TYPE
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-void check_error(const char *msg) {
-    if (errno) {
-        perror(msg);
-        exit(1);
-    }
-}
-
-int main() {
-    DIR *dir = opendir(".");
-    check_error("opendir");
-
-    struct dirent *de = NULL;
-
-    do {
-        de = readdir(dir);
-        check_error("readdir");
-    } while (de && strcmp(de->d_name, ".") != 0);
-    // We found the . dir or encountered end of dir stream
-
-    int status = 0;
-
-    if (!de) {
-        status = 1;
-    } else if (de->d_type == DT_DIR) {
-    } else if (de->d_type == DT_UNKNOWN) {
-        // Signal that we should skip test for non-zero d_type
-        status = 2;
-    } else {
-        status = 1;
-    }
-
-    closedir(dir);
-    check_error("closedir");
-
-    exit(status);
-}
-#else
-int main() { exit(2); }
-#endif
-]])],
-  [AC_MSG_RESULT(yes)],
-  [if test $? -eq 1 ; then
-     AC_MSG_FAILURE(Unexpected failure when testing for kernels d_type)
-   else
-     AC_MSG_RESULT(no (skipping DirEnt test))
-	 AC_DEFINE([NO_DTIR_TEST], [1], [Define to 1 if we want to stkip DirEnt test.])
-   fi])
-
 AC_CHECK_FUNCS([getgrgid_r getgrnam_r getpwnam_r getpwuid_r getpwnam getpwuid])
 AC_CHECK_FUNCS([getpwent getgrent])
 AC_CHECK_FUNCS([lchown setenv sysconf unsetenv clearenv])

tests/DirEnt.hsc

@@ -3,10 +3,10 @@
 #include "HsUnixConfig.h"
 
 module Main (main) where
-#if defined(NO_DTIR_TEST)
+#if !defined(HAVE_STRUCT_DIRENT_D_TYPE)
 main :: IO ()
 main = do
-    putStrLn "Skipping DirEnt test, since kernel seems to always return DT_UNKNOWN"
+    putStrLn "Skipping DirEnt test, since the system doesn't support d_type"
 #else
 
 import Control.Exception                (bracket, finally)

unix.cabal

@@ -53,6 +53,11 @@ flag os-string
   default: False
   manual: False
 
+flag non-portable-tests
+  description: Run tests that may not be portable across all systems, but are guaranteed to succeed in our own CI
+  default: False
+  manual: True
+
 source-repository head
     type:     git
     location: https://github.com/haskell/unix.git
@@ -390,4 +395,7 @@ test-suite DirEnt
     default-language: Haskell2010
     build-depends: base, unix
     ghc-options: -Wall
+    if !flag(non-portable-tests)
+        build-depends: unbuildable<0
+        buildable: False