Re-organize tests.

plutus-conformance/agda/Spec.hs

@@ -0,0 +1,12 @@
+{- | Conformance tests for the Agda implementation. -}
+
+module Main (main) where
+
+import MAlonzo.Code.Main (runUAgda)
+import PlutusConformance.Common (agdaEvalUplcProg, runUplcEvalTests)
+
+main :: IO ()
+main =
+    -- UPLC evaluation tests
+    runUplcEvalTests agdaEvalUplcProg
+

plutus-conformance/add-test-output/Spec.hs → plutus-conformance/executables/add-test-output/Spec.hs

@@ -123,8 +123,6 @@ main = do
                       putStrLn $ inputFile <> " failed to parse. Error written to " <> outFilePath
                       T.writeFile outFilePath shownParseError
                     Right pro -> do
-                      -- catch all sync exceptions and keep going
-                      -- (we still need this even with `evalUplcProg` using the safe eval function)
                       case evalUplcProg (() <$ pro) of
                         (Just prog) -> do
                           T.writeFile outFilePath (render $ pretty prog)

plutus-conformance/haskell/Spec.hs

@@ -0,0 +1,11 @@
+{- | Conformance tests for the Haskell implementation. -}
+
+module Main (main) where
+
+import PlutusConformance.Common (evalUplcProg, runUplcEvalTests)
+
+main :: IO ()
+main =
+    -- UPLC evaluation tests
+    runUplcEvalTests evalUplcProg
+

plutus-conformance/plutus-conformance.cabal

@@ -60,7 +60,7 @@ executable add-test-output
   import:         lang
   type:           exitcode-stdio-1.0
   main-is:        Spec.hs
-  hs-source-dirs: add-test-output/
+  hs-source-dirs: executables/add-test-output/
   other-modules:
   build-depends:
     , base                  >=4.9 && <5
@@ -71,34 +71,39 @@ executable add-test-output
     , tasty-golden
     , text
 
-test-suite uplc-eval-test
+executable haskell-implementation
   import:         lang
   type:           exitcode-stdio-1.0
   main-is:        Spec.hs
-  hs-source-dirs: uplc/evaluation
+  hs-source-dirs: executables/haskell-implementation
   other-modules:
   build-depends:
-    , base                >=4.9 && <5
+    , base                  >=4.9 && <5
+    , directory
+    , optparse-applicative
     , plutus-conformance
+    , plutus-core
+    , tasty-golden
+    , text
 
-test-suite tplc-eval-test
+test-suite haskell-implementation-conformance
   import:         lang
   type:           exitcode-stdio-1.0
   main-is:        Spec.hs
-  hs-source-dirs: tplc/evaluation
+  hs-source-dirs: haskell
   other-modules:
   build-depends:
-    , base          >=4.9 && <5
-    , tasty-golden
-    , text
+    , base                >=4.9 && <5
+    , plutus-conformance
+    , plutus-core
 
-test-suite tplc-typecheck-test
+test-suite agda-implementation-conformance
   import:         lang
   type:           exitcode-stdio-1.0
   main-is:        Spec.hs
-  hs-source-dirs: tplc/typecheck
+  hs-source-dirs: agda
   other-modules:
   build-depends:
-    , base          >=4.9 && <5
-    , tasty-golden
-    , text
+    , base                >=4.9 && <5
+    , plutus-conformance
+    , plutus-metatheory

plutus-conformance/src/PlutusConformance/Common.hs

@@ -125,7 +125,7 @@ parseTxt ::
     -> Either ParserErrorBundle (UPLC.Program Name DefaultUni DefaultFun SourcePos)
 parseTxt resTxt = runQuoteT $ UPLC.parseProgram resTxt
 
--- | Our `evaluator` for the UPLC tests is the CEK machine.
+-- | Our `evaluator` for the Haskell UPLC tests is the CEK machine.
 evalUplcProg :: UplcEvaluator
 evalUplcProg = traverseOf UPLC.progTerm eval
   where
@@ -138,6 +138,10 @@ evalUplcProg = traverseOf UPLC.progTerm eval
             Left _     -> Nothing
             Right prog -> Just prog
 
+-- | Our `evaluator` for the Agda UPLC tests is the CEK machine.
+agdaEvalUplcProg :: UplcProg -> Maybe UplcProg
+agdaEvalUplcProg _p = undefined
+
 -- | Run the tests given a `evaluator` that evaluates UPLC programs.
 runUplcEvalTests ::
     UplcEvaluator -- ^ The action to run the input through for the tests.