From a868c7aa2de80fa0d38b7d2cd5ce34a90799700a Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Thu, 3 Nov 2022 14:44:44 +0100
Subject: [PATCH] Error_monad: use octez-alcotezt instead of alcotest

---
 manifest/main.ml              |  4 +--
 opam/tezos-error-monad.opam   |  4 ++-
 src/lib_error_monad/test/dune | 51 ++++++++++++++++++++++++-----------
 tezt/tests/dune               |  3 ++-
 4 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 682d4b96f1d8..0fd4b7274012 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -809,12 +809,12 @@ let _octez_hacl_tests_1 =
     ~js_compatible:true
 
 let _octez_error_monad_tests =
-  tests
+  tezt
     ["test_registration"; "test_splitted_error_encoding"]
     ~path:"src/lib_error_monad/test"
     ~opam:"tezos-error-monad"
     ~modes:[Native; JS]
-    ~deps:[octez_error_monad |> open_; data_encoding; alcotest]
+    ~deps:[octez_error_monad |> open_; data_encoding; alcotezt]
     ~js_compatible:true
 
 let octez_rpc =
diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam
index 401f99dacd55..3074dc58273e 100644
--- a/opam/tezos-error-monad.opam
+++ b/opam/tezos-error-monad.opam
@@ -15,7 +15,8 @@ depends: [
   "lwt-canceler" { >= "0.3" & < "0.4" }
   "lwt" { >= "5.6.0" }
   "tezos-lwt-result-stdlib"
-  "alcotest" { with-test & >= "1.5.0" }
+  "tezt" { with-test & >= "3.0.0" }
+  "octez-alcotezt" {with-test}
 ]
 conflicts: [
   "result" { < "1.5" }
@@ -24,5 +25,6 @@ build: [
   ["rm" "-r" "vendors"]
   ["dune" "build" "-p" name "-j" jobs]
   ["dune" "runtest" "-p" name "-j" jobs] {with-test}
+  ["dune" "build" "@runtezt" "-p" name "-j" jobs] {with-test}
 ]
 synopsis: "Tezos: error monad"
diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune
index 8af814890519..384c1c1638e7 100644
--- a/src/lib_error_monad/test/dune
+++ b/src/lib_error_monad/test/dune
@@ -1,34 +1,55 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executables
- (names test_registration test_splitted_error_encoding)
- (modes native js)
+(library
+ (name src_lib_error_monad_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-error-monad
   data-encoding
-  alcotest)
+  octez-alcotezt)
  (js_of_ocaml)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
-  -open Tezos_error_monad))
+  -open Tezt_core
+  -open Tezt_core.Base
+  -open Tezos_error_monad
+  -open Octez_alcotezt)
+ (modules test_registration test_splitted_error_encoding))
+
+(executable
+ (name main)
+ (modes native)
+ (libraries
+  src_lib_error_monad_test_tezt_lib
+  tezt)
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-error-monad)
- (action (run %{dep:./test_registration.exe})))
+ (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-error-monad)
- (action (run %{dep:./test_splitted_error_encoding.exe})))
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
+
+(executable
+ (name main_js)
+ (modes js)
+ (libraries
+  src_lib_error_monad_test_tezt_lib
+  tezt.js)
+ (js_of_ocaml)
+ (modules main_js))
 
 (rule
- (alias runtest_js)
+ (alias runtezt_js)
  (package tezos-error-monad)
- (action (run node %{dep:./test_registration.bc.js})))
+ (action (run node %{dep:./main_js.bc.js})))
 
 (rule
- (alias runtest_js)
- (package tezos-error-monad)
- (action (run node %{dep:./test_splitted_error_encoding.bc.js})))
+ (targets main_js.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt_js.Test.run ()"))))
diff --git a/tezt/tests/dune b/tezt/tests/dune
index 9c45c39e3c6a..17c606f1ebb4 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -17,7 +17,8 @@
   src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib
   src_proto_015_PtLimaPt_lib_protocol_test_regression_tezt_lib
   src_lib_p2p_tezt_tezt_lib
-  src_lib_lwt_result_stdlib_test_tezt_lib)
+  src_lib_lwt_result_stdlib_test_tezt_lib
+  src_lib_error_monad_test_tezt_lib)
  (flags
   (:standard)
   -open Tezt
-- 
GitLab