From eb4bc644b10854f13342a17e238260981a73c975 Mon Sep 17 00:00:00 2001
From: Mann mit Hut <github+mmhat@with-h.at>
Date: Wed, 5 Jun 2024 16:34:23 +0200
Subject: [PATCH] Fix: Exclude unit test from beta-normalization in
 Dhall.Test.Normalization

---
 dhall/tests/Dhall/Test/Normalization.hs | 26 ++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/dhall/tests/Dhall/Test/Normalization.hs b/dhall/tests/Dhall/Test/Normalization.hs
index 32c59bb22..8ad57d498 100644
--- a/dhall/tests/Dhall/Test/Normalization.hs
+++ b/dhall/tests/Dhall/Test/Normalization.hs
@@ -8,6 +8,8 @@ import Dhall.Core (Expr (..), Var (..), throws)
 import System.FilePath ((</>))
 import Test.Tasty (TestTree)
 
+import qualified Control.Monad    as Monad
+import qualified Data.List        as List
 import qualified Data.Text        as Text
 import qualified Data.Text.IO     as Text.IO
 import qualified Dhall.Context    as Context
@@ -16,6 +18,7 @@ import qualified Dhall.Import     as Import
 import qualified Dhall.Parser     as Parser
 import qualified Dhall.Test.Util  as Test.Util
 import qualified Dhall.TypeCheck  as TypeCheck
+import qualified System.FilePath  as FilePath
 import qualified Test.Tasty       as Tasty
 import qualified Test.Tasty.HUnit as Tasty.HUnit
 import qualified Turtle
@@ -23,32 +26,41 @@ import qualified Turtle
 normalizationDirectory :: FilePath
 normalizationDirectory = "./dhall-lang/tests/normalization/success"
 
+unitDirectory :: FilePath
+unitDirectory = normalizationDirectory </> "unit/"
+
 getTests :: IO TestTree
 getTests = do
     let pattern = Turtle.chars <* "A.dhall"
 
     let normalizationFiles = do
-            path <- Turtle.lstree normalizationDirectory
+            path <- FilePath.normalise <$> Turtle.lstree normalizationDirectory
 
-            Nothing <- return (Turtle.stripPrefix (normalizationDirectory </> "unit/") path)
+            Monad.guard (not (FilePath.normalise unitDirectory `List.isPrefixOf` path))
 
             return path
 
     betaNormalizationTests <- Test.Util.discover pattern betaNormalizationTest normalizationFiles
 
-    alphaNormalizationTests <- do
+    alphaNormalizationTests <-
         Test.Util.discover pattern alphaNormalizationTest
             (Turtle.lstree "./dhall-lang/tests/alpha-normalization/success/")
 
-    let unitTestFiles = Turtle.lstree (normalizationDirectory </> "unit/")
+    let unitTestFiles = Turtle.lstree unitDirectory
 
     unitTests <- Test.Util.discover pattern unitTest unitTestFiles
 
     let testTree =
             Tasty.testGroup "normalization"
-                [ Tasty.testGroup "beta-normalization" [ betaNormalizationTests ]
-                , Tasty.testGroup "unit tests" [ unitTests ]
-                , Tasty.testGroup "alpha-normalization" [ alphaNormalizationTests ]
+                [ Tasty.testGroup "beta-normalization"
+                    [ betaNormalizationTests
+                    ]
+                , Tasty.testGroup "unit tests"
+                    [ unitTests
+                    ]
+                , Tasty.testGroup "alpha-normalization"
+                    [ alphaNormalizationTests
+                    ]
                 , customization
                 ]