Merge pull request #507 from haskell/ddump-timing-CPP

Workaround for overwriting of .ddump-timing in tests
haskell · Oct 14, 2024 · 3322046 · 3322046
2 parents e6660a7 + 76a2468
commit 3322046
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,19 +18,19 @@ jobs:
       matrix:
         include:
           # Linux
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.0.2"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.2.2"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.4.4"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.6.5"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.8.4"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "8.10.7" }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.0.2"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.2.8"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.4.8"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.6.5"  }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.6.5",
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.0.2"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.2.2"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.4.4"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.6.5"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.8.4"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "8.10.7" }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.0.2"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.2.8"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.4.8"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.6.5"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.6.5",
               flags: "-fUnsafeChecks -fInternalChecks" }
-          - { cabal: "3.10", os: ubuntu-latest,  ghc: "9.8.2"  }
+          - { cabal: "3.10", os: ubuntu-22.04,  ghc: "9.8.2"  }
           # Win
           - { cabal: "3.10", os: windows-latest, ghc: "8.4.4"  }
           # OOM when building tests
@@ -73,7 +73,7 @@ jobs:
       run: |
         sudo apt-get install -y libpapi-dev
         echo FLAG_PAPI=-fBenchPAPI >> "$GITHUB_ENV"
-      if: matrix.os == 'ubuntu-latest'
+      if: matrix.os == 'ubuntu-22.04'
     # ----------------
     - name: Versions
       run: |

diff --git a/vector/tests/Utilities.hs b/vector/tests/Utilities.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DefaultSignatures #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}

diff --git a/vector/vector.cabal b/vector/vector.cabal
@@ -208,7 +208,7 @@ common tests-common
     Tests.Vector.UnitTests
     Utilities
 
-  default-extensions: CPP,
+  default-extensions:
               ScopedTypeVariables,
               PatternGuards,
               MultiParamTypeClasses,