From 38b082d7a1dfd3464f9646b4b254c49aa8144cea Mon Sep 17 00:00:00 2001
From: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
Date: Thu, 2 Feb 2023 16:19:55 +0100
Subject: [PATCH] alcotezt: port [src/lib_client_base/test]

---
 manifest/main.ml              |  4 +--
 opam/tezos-client-base.opam   |  4 ++-
 src/lib_client_base/test/dune | 58 +++++++++++++++++++++++++----------
 tezt/tests/dune               |  1 +
 4 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 31ce16af4ffe..4db36ce390cc 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -2732,12 +2732,12 @@ let octez_client_base =
         ]
 
 let _octez_client_base_tests =
-  tests
+  tezt
     ["bip39_tests"; "pbkdf_tests"]
     ~path:"src/lib_client_base/test"
     ~opam:"tezos-client-base"
     ~with_macos_security_framework:true
-    ~deps:[octez_base; octez_client_base |> open_; alcotest]
+    ~deps:[octez_base; octez_client_base |> open_; alcotezt]
     ~js_compatible:true
     ~modes:[Native; JS]
 
diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam
index 4601644e9de4..d83084477060 100644
--- a/opam/tezos-client-base.opam
+++ b/opam/tezos-client-base.opam
@@ -16,11 +16,13 @@ depends: [
   "tezos-shell-services"
   "tezos-sapling"
   "uri" { >= "3.1.0" }
-  "alcotest" { with-test & >= "1.5.0" }
+  "tezt" { with-test & >= "3.0.0" }
+  "octez-alcotezt" {with-test}
 ]
 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: common helpers for `tezos-client`"
diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune
index 3a85ca3c6e5b..19b203b5d8af 100644
--- a/src/lib_client_base/test/dune
+++ b/src/lib_client_base/test/dune
@@ -3,37 +3,61 @@
 
 (env (_ (env-vars (NODE_PRELOAD hacl-wasm,ocaml-bls12-381,secp256k1-wasm))))
 
-(executables
- (names bip39_tests pbkdf_tests)
- (modes native js)
+(library
+ (name src_lib_client_base_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-base
   tezos-client-base
-  alcotest)
+  octez-alcotezt)
  (js_of_ocaml)
+ (library_flags (:standard -linkall))
+ (flags
+  (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
+  -open Tezos_client_base
+  -open Octez_alcotezt)
+ (modules bip39_tests pbkdf_tests))
+
+(executable
+ (name main)
+ (modes native)
+ (libraries
+  src_lib_client_base_test_tezt_lib
+  tezt)
  (link_flags
   (:standard)
   (:include %{workspace_root}/macos-link-flags.sexp))
- (flags
-  (:standard)
-  -open Tezos_client_base))
+ (modules main))
 
 (rule
- (alias runtest)
+ (alias runtezt)
  (package tezos-client-base)
- (action (run %{dep:./bip39_tests.exe})))
+ (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-client-base)
- (action (run %{dep:./pbkdf_tests.exe})))
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
+
+(executable
+ (name main_js)
+ (modes js)
+ (libraries
+  src_lib_client_base_test_tezt_lib
+  tezt.js)
+ (js_of_ocaml)
+ (link_flags
+  (:standard)
+  (:include %{workspace_root}/macos-link-flags.sexp))
+ (modules main_js))
 
 (rule
- (alias runtest_js)
+ (alias runtezt_js)
  (package tezos-client-base)
- (action (run node %{dep:./bip39_tests.bc.js})))
+ (action (run node %{dep:./main_js.bc.js})))
 
 (rule
- (alias runtest_js)
- (package tezos-client-base)
- (action (run node %{dep:./pbkdf_tests.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 d383e36cc91f..d0323aafdf13 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -82,6 +82,7 @@
   src_lib_context_test_tezt_lib
   src_lib_context_memory_test_tezt_lib
   src_lib_client_base_unix_test_tezt_lib
+  src_lib_client_base_test_tezt_lib
   src_lib_clic_test_tezt_lib
   src_lib_benchmark_test_tezt_lib
   src_lib_base_test_tezt_lib)
-- 
GitLab