diff --git a/manifest/main.ml b/manifest/main.ml index e0fa9fe1b1401d1b15b5efa1181cc8a4f4db4655..e76e4691bf3327dabb33cd41916d67c27b580d3a 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -1420,13 +1420,13 @@ let _octez_print_version_exe = ~bisect_ppx:No let _octez_version_tests = - test - "test_parser" + tezt + ["test_parser"] ~path:"src/lib_version/test" ~opam:"tezos-version" ~js_compatible:true ~modes:[Native; JS] - ~deps:[octez_version |> open_; octez_version_parser; alcotest] + ~deps:[octez_version |> open_; octez_version_parser; alcotezt] let octez_p2p_services = public_lib diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index bfba3844cb01d481943ae8a0d7dae29061e21bfd..169b52f81c73dd61c37f0df9745a49b588fe4dad 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -13,11 +13,13 @@ depends: [ "ppx_deriving" "tezos-base" "dune-configurator" - "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: version information generated from Git" diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index 37000ed1a73c28a7101dfd4002ede2c655806bee..2c9893c545294eec1ef8d22d4331fdb9c2cb83ff 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -3,24 +3,57 @@ (env (_ (env-vars (NODE_PRELOAD hacl-wasm,ocaml-bls12-381,secp256k1-wasm)))) -(executable - (name test_parser) - (modes native js) +(library + (name src_lib_version_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-version tezos-version.parser - alcotest) + octez-alcotezt) (js_of_ocaml) + (library_flags (:standard -linkall)) (flags (:standard) - -open Tezos_version)) + -open Tezt_core + -open Tezt_core.Base + -open Tezos_version + -open Octez_alcotezt) + (modules test_parser)) + +(executable + (name main) + (instrumentation (backend bisect_ppx --bisect-sigterm)) + (modes native) + (libraries + src_lib_version_test_tezt_lib + tezt) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-version) - (action (run %{dep:./test_parser.exe}))) + (action (run %{dep:./main.exe}))) + +(rule + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) + +(executable + (name main_js) + (instrumentation (backend bisect_ppx --bisect-sigterm)) + (modes js) + (libraries + src_lib_version_test_tezt_lib + tezt.js) + (js_of_ocaml) + (modules main_js)) (rule - (alias runtest_js) + (alias runtezt_js) (package tezos-version) - (action (run node %{dep:./test_parser.bc.js}))) + (action (run node %{dep:./main_js.bc.js}))) + +(rule + (targets main_js.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt_js.Test.run ()")))) diff --git a/src/lib_version/test/test_parser.ml b/src/lib_version/test/test_parser.ml index 7bbeeea9b1796d6c5d4aefb194fd77a8573b331f..c8f25c686b3580fe33554e637c18d15abdfd811d 100644 --- a/src/lib_version/test/test_parser.ml +++ b/src/lib_version/test/test_parser.ml @@ -25,8 +25,9 @@ (** Testing _______ - - Invocation: dune build @src/lib_version/test/runtest + Component: lib_version + Invocation: dune exec src/lib_version/test/main.exe + Subject: Test versions parser *) module Assert = struct diff --git a/tezt/tests/dune b/tezt/tests/dune index 8712a0ecc48d18183907ca1ef1926d6a1925281b..422651ae64d927c337a6aeec17ea0084e44d22cb 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -57,6 +57,7 @@ src_proto_015_PtLimaPt_lib_client_test_tezt_lib src_lib_workers_test_tezt_lib src_lib_webassembly_tests_tezt_lib + src_lib_version_test_tezt_lib src_lib_tree_encoding_test_tezt_lib src_lib_stdlib_unix_test__tezt_lib src_lib_stdlib_test_unix_tezt_lib