diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 7e581555a35..f9f2d6b588b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -245,13 +245,13 @@ jobs: run: | set +e rc=0 - tests="lib-tests lib-suite cli-tests cli-suite" + tests="cli-suite" if [ "${{ matrix.ghc }}" = "${{ env.GHC_FOR_SOLVER_BENCHMARKS }}" ]; then tests="$tests solver-benchmarks-tests solver-benchmarks-run" fi for test in $tests; do echo Validate "$test" - sh validate.sh $FLAGS -s "$test" || rc=1 + sh validate.sh $FLAGS -s "$test" --tasty-arg "PackageTests/IndexCabalFileParseError/cabal.test.hs" || rc=1 echo End "$test" done exit $rc diff --git a/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs b/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs index fb2840be9e6..9e951726fdc 100644 --- a/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs +++ b/cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs @@ -17,8 +17,29 @@ import Data.Array ((!)) import qualified Data.Foldable as F +import System.IO.Unsafe + normalizeOutput :: NormalizerEnv -> String -> String -normalizeOutput nenv = +normalizeOutput nenv input = + let output = normalizeOutput' nenv input + in seq + (unsafePerformIO $ do + putStrLn $ "===================START====================================" + putStrLn $ "normalizerTmpDir: " <> normalizerTmpDir nenv + putStrLn $ "normalizerCanonicalTmpDir: " <> normalizerCanonicalTmpDir nenv + + putStrLn $ "-------------------START------------------------------------" + putStrLn $ "input: " <> input + putStrLn $ "-------------------MID--------------------------------------" + putStrLn $ "output: " <> output + putStrLn $ "-------------------END--------------------------------------" + putStrLn $ "===================END======================================" + ) + output +{-# NOINLINE normalizeOutput #-} + +normalizeOutput' :: NormalizerEnv -> String -> String +normalizeOutput' nenv = -- Normalize backslashes to forward slashes to normalize -- file paths map (\c -> if c == '\\' then '/' else c)