From 93d54872ab3ff715f9ea073b880618f517f8ffd9 Mon Sep 17 00:00:00 2001
From: Pietro Abate <pietro.abate@nomadic-labs.com>
Date: Wed, 15 Feb 2023 10:07:48 +0100
Subject: [PATCH] alcotezt: port [src/lib_clic/test]

Co-authored-by: Arvid Jakobsson <arvid.jakobsson@nomadic-labs.com>
---
 manifest/main.ml       |  6 +++---
 opam/tezos-clic.opam   |  4 +++-
 src/lib_clic/test/dune | 30 +++++++++++++++++++++++-------
 tezt/tests/dune        |  1 +
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/manifest/main.ml b/manifest/main.ml
index 0bfa9020020a..79e5a9253856 100644
--- a/manifest/main.ml
+++ b/manifest/main.ml
@@ -1084,11 +1084,11 @@ let octez_clic_unix =
       ]
 
 let _octez_clic_tests =
-  test
-    "test_clic"
+  tezt
+    ["test_clic"]
     ~path:"src/lib_clic/test"
     ~opam:"tezos-clic"
-    ~deps:[octez_stdlib |> open_; octez_clic |> open_; alcotest_lwt]
+    ~deps:[octez_stdlib |> open_; octez_clic |> open_; lwt_unix; alcotezt]
 
 let _octez_clic_example =
   private_exe
diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam
index b5132eac27cb..e9f831c8e40f 100644
--- a/opam/tezos-clic.opam
+++ b/opam/tezos-clic.opam
@@ -16,11 +16,13 @@ depends: [
   "tezos-error-monad"
   "tezos-lwt-result-stdlib"
   "tezos-stdlib-unix"
-  "alcotest-lwt" { 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: library of auto-documented command-line-parsing combinators"
diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune
index 673a7dc59c05..871dab90af72 100644
--- a/src/lib_clic/test/dune
+++ b/src/lib_clic/test/dune
@@ -1,18 +1,34 @@
 ; This file was automatically generated, do not edit.
 ; Edit file manifest/main.ml instead.
 
-(executable
- (name test_clic)
+(library
+ (name src_lib_clic_test_tezt_lib)
+ (instrumentation (backend bisect_ppx))
  (libraries
+  tezt.core
   tezos-stdlib
   tezos-clic
-  alcotest-lwt)
+  lwt.unix
+  octez-alcotezt)
+ (library_flags (:standard -linkall))
  (flags
   (:standard)
+  -open Tezt_core
+  -open Tezt_core.Base
   -open Tezos_stdlib
-  -open Tezos_clic))
+  -open Tezos_clic
+  -open Octez_alcotezt)
+ (modules test_clic))
+
+(executable
+ (name main)
+ (libraries
+  src_lib_clic_test_tezt_lib
+  tezt)
+ (modules main))
+
+(rule (alias runtezt) (package tezos-clic) (action (run %{dep:./main.exe})))
 
 (rule
- (alias runtest)
- (package tezos-clic)
- (action (run %{dep:./test_clic.exe})))
+ (targets main.ml)
+ (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()"))))
diff --git a/tezt/tests/dune b/tezt/tests/dune
index e0a6bd501668..adae72d8107e 100644
--- a/tezt/tests/dune
+++ b/tezt/tests/dune
@@ -25,6 +25,7 @@
   src_lib_lwt_result_stdlib_test_tezt_lib
   src_lib_lazy_containers_test_tezt_lib
   src_lib_error_monad_test_tezt_lib
+  src_lib_clic_test_tezt_lib
   src_lib_benchmark_test_tezt_lib
   src_lib_base_test_tezt_lib)
  (link_flags
-- 
GitLab