Reenable script tests for Windows/ghc-9.4.*

cabal-testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.test.hs

@@ -1,13 +1,10 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-build" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]
 
-    env      <- getTestEnv
-    cacheDir <- getScriptCacheDirectory $ testCurrentDir env </> "script.hs"
+  env      <- getTestEnv
+  cacheDir <- getScriptCacheDirectory $ testCurrentDir env </> "script.hs"
 
-    shouldExist $ cacheDir </> "fake-package.cabal"
-    shouldExist $ cacheDir </> "scriptlocation"
+  shouldExist $ cacheDir </> "fake-package.cabal"
+  shouldExist $ cacheDir </> "scriptlocation"

cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.test.hs

@@ -1,8 +1,5 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-build" ["script.hs"]
-    cabalWithStdin "v2-repl" ["script.hs"] ""
+  cabal' "v2-build" ["script.hs"]
+  cabalWithStdin "v2-repl" ["script.hs"] ""

cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.test.hs

@@ -1,8 +1,5 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-build" ["script.hs"]
-    cabal' "v2-run" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]
+  cabal' "v2-run" ["script.hs"]

cabal-testsuite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.test.hs

@@ -1,8 +1,5 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-build" ["script.hs"]
-    cabal' "v2-build" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]

cabal-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.test.hs

@@ -2,20 +2,17 @@ import Test.Cabal.Prelude
 import System.Directory (copyFile, removeFile)
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    env <- getTestEnv
-    let td = testCurrentDir env
+  env <- getTestEnv
+  let td = testCurrentDir env
 
-    cabal' "v2-build" ["script.hs"]
-    liftIO $ copyFile (td </> "script.hs") (td </> "script2.hs")
-    cabal' "v2-build" ["script2.hs"]
-    liftIO $ removeFile (td </> "script2.hs")
-    cabal' "v2-clean" []
+  cabal' "v2-build" ["script.hs"]
+  liftIO $ copyFile (td </> "script.hs") (td </> "script2.hs")
+  cabal' "v2-build" ["script2.hs"]
+  liftIO $ removeFile (td </> "script2.hs")
+  cabal' "v2-clean" []
 
-    cacheDir  <- getScriptCacheDirectory (td </> "script.hs")
-    cacheDir2 <- getScriptCacheDirectory (td </> "script2.hs")
+  cacheDir  <- getScriptCacheDirectory (td </> "script.hs")
+  cacheDir2 <- getScriptCacheDirectory (td </> "script2.hs")
 
-    shouldDirectoryExist cacheDir
-    shouldDirectoryNotExist cacheDir2
+  shouldDirectoryExist cacheDir
+  shouldDirectoryNotExist cacheDir2

cabal-testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.test.hs

@@ -2,20 +2,17 @@ import Test.Cabal.Prelude
 import System.Directory (copyFile, removeFile)
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    env <- getTestEnv
-    let td = testCurrentDir env
+  env <- getTestEnv
+  let td = testCurrentDir env
 
-    cabal' "v2-build" ["script.hs"]
-    liftIO $ copyFile (td </> "script.hs") (td </> "script2.hs")
-    cabal' "v2-build" ["script2.hs"]
-    liftIO $ removeFile (td </> "script2.hs")
-    cabal' "v2-clean" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]
+  liftIO $ copyFile (td </> "script.hs") (td </> "script2.hs")
+  cabal' "v2-build" ["script2.hs"]
+  liftIO $ removeFile (td </> "script2.hs")
+  cabal' "v2-clean" ["script.hs"]
 
-    cacheDir  <- getScriptCacheDirectory (td </> "script.hs")
-    cacheDir2 <- getScriptCacheDirectory (td </> "script2.hs")
+  cacheDir  <- getScriptCacheDirectory (td </> "script.hs")
+  cacheDir2 <- getScriptCacheDirectory (td </> "script2.hs")
 
-    shouldDirectoryNotExist cacheDir
-    shouldDirectoryNotExist cacheDir2
+  shouldDirectoryNotExist cacheDir
+  shouldDirectoryNotExist cacheDir2

cabal-testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.test.hs

@@ -1,14 +1,11 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-build" ["script.hs"]
-    cabal' "v2-clean" ["script.hs"]
+  cabal' "v2-build" ["script.hs"]
+  cabal' "v2-clean" ["script.hs"]
 
-    env <- getTestEnv
-    cacheDir <- getScriptCacheDirectory (testCurrentDir env </> "script.hs")
+  env <- getTestEnv
+  cacheDir <- getScriptCacheDirectory (testCurrentDir env </> "script.hs")
 
-    shouldDirectoryNotExist cacheDir
-    shouldDirectoryNotExist (testDistDir env)
+  shouldDirectoryNotExist cacheDir
+  shouldDirectoryNotExist (testDistDir env)

cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs

@@ -1,14 +1,11 @@
 import Test.Cabal.Prelude
 
 main = cabalTest $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    res <- cabal' "v2-run" ["script.hs"]
-    assertOutputContains "Hello World" res
+  res <- cabal' "v2-run" ["script.hs"]
+  assertOutputContains "Hello World" res
 
-    env      <- getTestEnv
-    cacheDir <- getScriptCacheDirectory (testCurrentDir env </> "script.hs")
+  env      <- getTestEnv
+  cacheDir <- getScriptCacheDirectory (testCurrentDir env </> "script.hs")
 
-    shouldExist $ cacheDir </> "fake-package.cabal"
-    shouldExist $ cacheDir </> "scriptlocation"
+  shouldExist $ cacheDir </> "fake-package.cabal"
+  shouldExist $ cacheDir </> "scriptlocation"

cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs

@@ -1,8 +1,5 @@
 import Test.Cabal.Prelude
 
 main = cabalTest $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    res <- cabal' "v2-run" ["script.lhs"]
-    assertOutputContains "Hello World" res
+  res <- cabal' "v2-run" ["script.lhs"]
+  assertOutputContains "Hello World" res

cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptNoExtension/cabal.test.hs

@@ -1,7 +1,4 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-run" ["with sp"] >>= assertOutputContains "Hello World"
+  cabal' "v2-run" ["with sp"] >>= assertOutputContains "Hello World"

cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptRerun/cabal.test.hs

@@ -1,8 +1,5 @@
 import Test.Cabal.Prelude
 
 main = cabalTest . void $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    cabal' "v2-run" ["script.hs"]
-    cabal' "v2-run" ["script.hs"]
+  cabal' "v2-run" ["script.hs"]
+  cabal' "v2-run" ["script.hs"]

cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptWithProjectBlock/cabal.test.hs

@@ -1,9 +1,6 @@
 import Test.Cabal.Prelude
 
 main = cabalTest $ do
-  isWin <- isWindows
-  ghc94 <- isGhcVersion "== 9.4.*"
-  expectBrokenIf (isWin && ghc94) 8451 $ do
-    -- script is called "s.hs" to avoid Windows long path issue in CI
-    res <- cabal' "v2-run" ["s.hs"]
-    assertOutputContains "Hello World" res
+  -- script is called "s.hs" to avoid Windows long path issue in CI
+  res <- cabal' "v2-run" ["s.hs"]
+  assertOutputContains "Hello World" res