wip

Author: zeme-wana

cardano-constitution/test/Cardano/Constitution/Validator/Data/GoldenTests.hs

@@ -22,7 +22,7 @@ import Data.Maybe
 import Data.String
 import System.FilePath
 import Test.Tasty
-import Test.Tasty.Extras (ignoreThisTestIfHpcIsEnabled)
+import Test.Tasty.Extras (ignoreTestWhenHpcEnabled)
 import Test.Tasty.Golden
 
 import Helpers.Guardrail
@@ -68,11 +68,11 @@ test_readable_uplc = testGroup "ReadableUplc" $ M.elems $
 
 tests :: TestTreeWithTestState
 tests = testGroup' "Golden" $ fmap const
-        [ ignoreThisTestIfHpcIsEnabled test_cbor
-        , ignoreThisTestIfHpcIsEnabled test_budget_large
-        , ignoreThisTestIfHpcIsEnabled test_budget_small
+        [ ignoreTestWhenHpcEnabled test_cbor
+        , ignoreTestWhenHpcEnabled test_budget_large
+        , ignoreTestWhenHpcEnabled test_budget_small
         , test_readable_pir
-        , ignoreThisTestIfHpcIsEnabled test_readable_uplc
+        , ignoreTestWhenHpcEnabled test_readable_uplc
         ]
 
 -- HELPERS

cardano-constitution/test/Cardano/Constitution/Validator/GoldenTests.hs

@@ -22,7 +22,7 @@ import Data.Maybe
 import Data.String
 import System.FilePath
 import Test.Tasty
-import Test.Tasty.Extras (ignoreThisTestIfHpcIsEnabled)
+import Test.Tasty.Extras (ignoreTestWhenHpcEnabled)
 import Test.Tasty.Golden
 
 import Helpers.Guardrail
@@ -68,11 +68,11 @@ test_readable_uplc = testGroup "ReadableUplc" $ M.elems $
 
 tests :: TestTreeWithTestState
 tests = testGroup' "Golden" $ fmap const
-        [ ignoreThisTestIfHpcIsEnabled test_cbor
-        , ignoreThisTestIfHpcIsEnabled test_budget_large
-        , ignoreThisTestIfHpcIsEnabled test_budget_small
+        [ ignoreTestWhenHpcEnabled test_cbor
+        , ignoreTestWhenHpcEnabled test_budget_large
+        , ignoreTestWhenHpcEnabled test_budget_small
         , test_readable_pir
-        , ignoreThisTestIfHpcIsEnabled test_readable_uplc
+        , ignoreTestWhenHpcEnabled test_readable_uplc
         ]
 
 -- HELPERS

nix/project.nix

@@ -24,12 +24,12 @@ let
           # below represent the largest subset that can be enabled without 
           # breaking tests.
           # packages.cardano-constitution.doCoverage = true;
+          # packages.plutus-tx.doCoverage = true;
           packages.plutus-conformance.doCoverage = true;
           packages.plutus-core.doCoverage = true;
           packages.plutus-executables.doCoverage = true;
           packages.plutus-tx-test-util.doCoverage = true;
           packages.plutus-ledger-api.doCoverage = true;
-          # packages.plutus-tx.doCoverage = true;
 
           packages.plutus-core.configureFlags = [ "--ghc-option=-D__HPC_ENABLED__" ];
           # plutus-benchmark

plutus-benchmark/marlowe/test/Spec.hs

@@ -19,7 +19,7 @@ import PlutusLedgerApi.V3 (ExCPU (..), ExMemory (..))
 import System.FilePath ((</>))
 import System.IO (hPutStrLn)
 import Test.Tasty (defaultMain, testGroup)
-import Test.Tasty.Extras (ignoreThisTestIfHpcIsEnabled)
+import Test.Tasty.Extras (ignoreTestWhenHpcEnabled)
 import UntypedPlutusCore.Size qualified as UPLC
 
 main :: IO ()
@@ -82,4 +82,4 @@ main = withUtf8 $ do
         ]
 
   -- Write the measures to the actual file
-  defaultMain $ ignoreThisTestIfHpcIsEnabled marloweTests
+  defaultMain $ ignoreTestWhenHpcEnabled marloweTests

plutus-benchmark/script-contexts/test/V1/Spec.hs

@@ -5,7 +5,7 @@ module V1.Spec (allTests) where
 import Data.Text qualified as Text
 
 import Test.Tasty
-import Test.Tasty.Extras (TestNested, ignoreThisTestIfHpcIsEnabled, runTestNested, testNestedGhc)
+import Test.Tasty.Extras (TestNested, ignoreTestWhenHpcEnabled, runTestNested, testNestedGhc)
 import Test.Tasty.HUnit
 
 import PlutusBenchmark.Common (Term, compiledCodeToTerm, runTermCek, unsafeRunTermCek)
@@ -47,7 +47,7 @@ testCheckSOPSc1 = testGroup "checkScriptContext1"
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)
     , testCase "fails on 5" . assertFailed $
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [
                     Tx.goldenSize "checkScriptContext1" $
@@ -92,7 +92,7 @@ testCheckSOPSc2 = testGroup "checkScriptContext2"
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)
     , testCase "succeed on 5" . assertSucceeded $
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [ Tx.goldenSize "checkScriptContext2" $
                     SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1)

plutus-benchmark/script-contexts/test/V2/Spec.hs

@@ -7,7 +7,7 @@ module V2.Spec (allTests) where
 import Data.Text qualified as Text
 
 import Test.Tasty
-import Test.Tasty.Extras (TestNested, ignoreThisTestIfHpcIsEnabled, runTestNested, testNestedGhc)
+import Test.Tasty.Extras (TestNested, ignoreTestWhenHpcEnabled, runTestNested, testNestedGhc)
 import Test.Tasty.HUnit
 
 import PlutusBenchmark.Common (Term, compiledCodeToTerm, runTermCek, unsafeRunTermCek)
@@ -51,7 +51,7 @@ testCheckSOPSc1 = testGroup "checkScriptContext1"
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)
     , testCase "fails on 5" . assertFailed $
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [
                     Tx.goldenSize "checkScriptContext1" $
@@ -96,7 +96,7 @@ testCheckSOPSc2 = testGroup "checkScriptContext2"
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)
     , testCase "succeed on 5" . assertSucceeded $
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [
                     Tx.goldenSize "checkScriptContext2" $
@@ -163,7 +163,7 @@ testCheckDataScEquality = testGroup "checkScriptContextEquality"
 
 testSOPFwdStakeTrick :: TestTree
 testSOPFwdStakeTrick =
-     ignoreThisTestIfHpcIsEnabled $
+     ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [ Tx.goldenSize "sopFwdStakeTrick" testCode
                , Tx.goldenPirReadable "sopFwdStakeTrick" testAbsCode

plutus-benchmark/script-contexts/test/V3/Spec.hs

@@ -5,7 +5,7 @@ module V3.Spec (allTests) where
 import Data.Text qualified as Text
 
 import Test.Tasty
-import Test.Tasty.Extras (TestNested, ignoreThisTestIfHpcIsEnabled, runTestNested, testNestedGhc)
+import Test.Tasty.Extras (TestNested, ignoreTestWhenHpcEnabled, runTestNested, testNestedGhc)
 import Test.Tasty.HUnit
 
 import PlutusBenchmark.Common (Term, compiledCodeToTerm, runTermCek, unsafeRunTermCek)
@@ -47,7 +47,7 @@ testCheckSOPSc1 = testGroup "checkScriptContext1"
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 4)
     , testCase "fails on 5" . assertFailed $
         compiledCodeToTerm $ SOP.SC.mkCheckScriptContext1Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [
                     Tx.goldenSize "checkScriptContext1" $
@@ -92,7 +92,7 @@ testCheckSOPSc2 = testGroup "checkScriptContext2"
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 4)
     , testCase "succeed on 5" . assertSucceeded $
           compiledCodeToTerm $ SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 5)
-    , ignoreThisTestIfHpcIsEnabled $
+    , ignoreTestWhenHpcEnabled $
           runTestGhcSOP
                [ Tx.goldenSize "checkScriptContext2" $
                         SOP.SC.mkCheckScriptContext2Code (SOP.SC.mkScriptContext 1)
@@ -157,7 +157,7 @@ testCheckDataScEquality = testGroup "checkScriptContextEquality"
     ]
 
 testPurposeIsWellFormed :: TestTree
-testPurposeIsWellFormed = ignoreThisTestIfHpcIsEnabled $ testGroup "purposeIsWellFormed"
+testPurposeIsWellFormed = ignoreTestWhenHpcEnabled $ testGroup "purposeIsWellFormed"
     [ runTestGhcData [  Tx.goldenPirReadable "purposeIsWellFormed" $
                         Data.SC.compiledPurposeIsWellFormed
                    , Tx.goldenSize "purposeIsWellFormed" $

plutus-core/testlib/Test/Tasty/Extras.hs

@@ -34,7 +34,7 @@ module Test.Tasty.Extras
     , assertEqualPretty
     , (%=?)
     , (%?=)
-    , ignoreThisTestIfHpcIsEnabled
+    , ignoreTestWhenHpcEnabled
     ) where
 
 import PlutusPrelude hiding (toList)
@@ -322,8 +322,8 @@ Some tests inspect GHC code, but GHC code gets instrumented when using HPC
 (Haskell Program Coverage), which causes those tests to fail.
 This function disables those tests when the custom __HPC_ENABLED__ flag is defined.
 -}
-ignoreThisTestIfHpcIsEnabled :: TestTree -> TestTree
-ignoreThisTestIfHpcIsEnabled t =
+ignoreTestWhenHpcEnabled :: TestTree -> TestTree
+ignoreTestWhenHpcEnabled t =
 #ifdef __HPC_ENABLED__
     ignoreTest t
 #else

plutus-core/untyped-plutus-core/testlib/Evaluation/Builtins/Definition.hs

@@ -1248,7 +1248,7 @@ test_definition =
         , test_SwapEls
         , test_IdBuiltinData
         , test_TrackCostsRestricting
-        , ignoreThisTestIfHpcIsEnabled test_TrackCostsRetaining
+        , ignoreTestWhenHpcEnabled test_TrackCostsRetaining
         , test_SerialiseDataImpossible
         , test_fixId
         , runTestNestedHere

plutus-ledger-api/test/Spec/Data/Eval.hs

@@ -32,7 +32,7 @@ import Data.Maybe (fromJust)
 import Data.Set qualified as Set
 import NoThunks.Class
 import Test.Tasty
-import Test.Tasty.Extras (ignoreThisTestIfHpcIsEnabled)
+import Test.Tasty.Extras (ignoreTestWhenHpcEnabled)
 import Test.Tasty.HUnit
 
 {- Note [Direct UPLC code]
@@ -132,6 +132,6 @@ tests = testGroup "eval"
     [ testAPI
 --    , testUnlifting
     , evaluationContextCacheIsComplete
-    , ignoreThisTestIfHpcIsEnabled evaluationContextNoThunks
+    , ignoreTestWhenHpcEnabled evaluationContextNoThunks
     ]
 

plutus-ledger-api/test/Spec/Eval.hs

@@ -32,7 +32,7 @@ import Data.Maybe (fromJust)
 import Data.Set qualified as Set
 import NoThunks.Class
 import Test.Tasty
-import Test.Tasty.Extras (ignoreThisTestIfHpcIsEnabled)
+import Test.Tasty.Extras (ignoreTestWhenHpcEnabled)
 import Test.Tasty.HUnit
 
 {- Note [Direct UPLC code]
@@ -132,6 +132,6 @@ tests = testGroup "eval"
     [ testAPI
 --    , testUnlifting
     , evaluationContextCacheIsComplete
-    , ignoreThisTestIfHpcIsEnabled evaluationContextNoThunks
+    , ignoreTestWhenHpcEnabled evaluationContextNoThunks
     ]