From 7670d4ef304e6bb2b4f54cadf05fd23dbd6614ac Mon Sep 17 00:00:00 2001 From: lykimq Date: Wed, 22 Feb 2023 11:31:18 +0100 Subject: [PATCH] Alcotezt: port [src/proto_/lib_protocol/test/pbt] --- .gitlab/ci/jobs/coverage/coverage.yml | 3 - .gitlab/ci/jobs/test/unit.yml | 27 --- manifest/main.ml | 17 +- opam/tezos-protocol-015-PtLimaPt-tests.opam | 1 - opam/tezos-protocol-016-PtMumbai-tests.opam | 5 +- opam/tezos-protocol-alpha-tests.opam | 5 +- .../lib_protocol/test/pbt/dune | 151 ++++---------- .../test/pbt/liquidity_baking_pbt.ml | 5 +- .../test/pbt/saturation_fuzzing.ml | 12 +- .../lib_protocol/test/pbt/test_bitset.ml | 2 +- .../test/pbt/test_carbonated_map.ml | 2 +- .../test/pbt/test_compare_operations.ml | 4 +- .../test/pbt/test_gas_properties.ml | 4 +- .../lib_protocol/test/pbt/test_merkle_list.ml | 4 +- .../lib_protocol/test/pbt/test_sampler.ml | 5 +- .../test/pbt/test_sc_rollup_encoding.ml | 5 +- .../test/pbt/test_sc_rollup_tick_repr.ml | 4 +- .../test/pbt/test_script_comparison.ml | 14 +- .../lib_protocol/test/pbt/test_tez_repr.ml | 2 +- .../test/pbt/test_tx_rollup_l2_encoding.ml | 4 +- .../test/pbt/test_zk_rollup_encoding.ml | 4 +- .../lib_protocol/test/helpers/dal_helpers.ml | 2 +- .../lib_protocol/test/pbt/dune | 187 ++++-------------- .../test/pbt/liquidity_baking_pbt.ml | 5 +- .../test/pbt/saturation_fuzzing.ml | 12 +- .../lib_protocol/test/pbt/test_bitset.ml | 2 +- .../test/pbt/test_bytes_conversion.ml | 5 +- .../test/pbt/test_carbonated_map.ml | 2 +- .../test/pbt/test_compare_operations.ml | 4 +- .../test/pbt/test_dal_slot_proof.ml | 11 +- .../test/pbt/test_gas_properties.ml | 4 +- .../lib_protocol/test/pbt/test_merkle_list.ml | 4 +- .../test/pbt/test_operation_encoding.ml | 2 +- .../test/pbt/test_refutation_game.ml | 2 +- .../lib_protocol/test/pbt/test_sampler.ml | 5 +- .../test/pbt/test_sc_rollup_encoding.ml | 5 +- .../test/pbt/test_sc_rollup_tick_repr.ml | 4 +- .../test/pbt/test_script_comparison.ml | 14 +- .../lib_protocol/test/pbt/test_tez_repr.ml | 2 +- .../test/pbt/test_tx_rollup_l2_encoding.ml | 4 +- .../test/pbt/test_zk_rollup_encoding.ml | 4 +- .../lib_protocol/test/helpers/dal_helpers.ml | 2 +- src/proto_alpha/lib_protocol/test/pbt/dune | 178 ++++------------- .../test/pbt/liquidity_baking_pbt.ml | 5 +- .../test/pbt/saturation_fuzzing.ml | 12 +- .../lib_protocol/test/pbt/test_bitset.ml | 2 +- .../test/pbt/test_bytes_conversion.ml | 5 +- .../test/pbt/test_carbonated_map.ml | 2 +- .../test/pbt/test_compare_operations.ml | 4 +- .../test/pbt/test_dal_slot_proof.ml | 11 +- .../test/pbt/test_gas_properties.ml | 4 +- .../lib_protocol/test/pbt/test_merkle_list.ml | 4 +- .../test/pbt/test_operation_encoding.ml | 2 +- .../test/pbt/test_refutation_game.ml | 2 +- .../lib_protocol/test/pbt/test_sampler.ml | 5 +- .../test/pbt/test_sc_rollup_encoding.ml | 5 +- .../test/pbt/test_sc_rollup_tick_repr.ml | 4 +- .../test/pbt/test_script_comparison.ml | 14 +- .../lib_protocol/test/pbt/test_tez_repr.ml | 2 +- .../test/pbt/test_zk_rollup_encoding.ml | 4 +- tezt/tests/dune | 3 + 61 files changed, 289 insertions(+), 541 deletions(-) diff --git a/.gitlab/ci/jobs/coverage/coverage.yml b/.gitlab/ci/jobs/coverage/coverage.yml index 4d3102815d20..01df15aa3297 100644 --- a/.gitlab/ci/jobs/coverage/coverage.yml +++ b/.gitlab/ci/jobs/coverage/coverage.yml @@ -59,9 +59,6 @@ unified_coverage: - "unit:alpha: [proto_alpha__lib_protocol__1]" - "unit:alpha: [proto_alpha__lib_protocol__2]" - "unit:alpha: [proto_alpha__lib_protocol__3]" - - "unit:alpha: [proto_alpha__lib_protocol__pbt1]" - - "unit:alpha: [proto_alpha__lib_protocol__pbt2]" - - "unit:alpha: [proto_alpha__lib_protocol__pbt3]" - "unit:non-proto-x86_64" script: diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index 57590a0ec0da..ee8e7b02be0e 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -58,21 +58,12 @@ unit:015_PtLimaPt: proto_015_PtLimaPt__lib_protocol__3: > @src/proto_015_PtLimaPt/lib_protocol/test/unit/runtest @src/proto_015_PtLimaPt/lib_protocol/runtezt - proto_015_PtLimaPt__lib_protocol__pbt1: > - @src/proto_015_PtLimaPt/lib_protocol/test/pbt/runtest1 - proto_015_PtLimaPt__lib_protocol__pbt2: > - @src/proto_015_PtLimaPt/lib_protocol/test/pbt/runtest2 - proto_015_PtLimaPt__lib_protocol__pbt3: > - @src/proto_015_PtLimaPt/lib_protocol/test/pbt/runtest3 parallel: matrix: - TEST_TARGETS: - proto_015_PtLimaPt__lib_protocol__1 - proto_015_PtLimaPt__lib_protocol__2 - proto_015_PtLimaPt__lib_protocol__3 - - proto_015_PtLimaPt__lib_protocol__pbt1 - - proto_015_PtLimaPt__lib_protocol__pbt2 - - proto_015_PtLimaPt__lib_protocol__pbt3 script: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} - ./scripts/ci/merge_coverage.sh @@ -94,12 +85,6 @@ unit:016_PtMumbai: proto_016_PtMumbai__lib_protocol__3: > @src/proto_016_PtMumbai/lib_protocol/test/unit/runtest @src/proto_016_PtMumbai/lib_protocol/runtezt - proto_016_PtMumbai__lib_protocol__pbt1: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest1 - proto_016_PtMumbai__lib_protocol__pbt2: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest2 - proto_016_PtMumbai__lib_protocol__pbt3: > - @src/proto_016_PtMumbai/lib_protocol/test/pbt/runtest3 proto_016_PtMumbai: > @src/proto_016_PtMumbai/lib_dal/runtest parallel: @@ -108,9 +93,6 @@ unit:016_PtMumbai: - proto_016_PtMumbai__lib_protocol__1 - proto_016_PtMumbai__lib_protocol__2 - proto_016_PtMumbai__lib_protocol__3 - - proto_016_PtMumbai__lib_protocol__pbt1 - - proto_016_PtMumbai__lib_protocol__pbt2 - - proto_016_PtMumbai__lib_protocol__pbt3 - proto_016_PtMumbai script: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} @@ -133,12 +115,6 @@ unit:alpha: proto_alpha__lib_protocol__3: > @src/proto_alpha/lib_protocol/test/unit/runtest @src/proto_alpha/lib_protocol/runtezt - proto_alpha__lib_protocol__pbt1: > - @src/proto_alpha/lib_protocol/test/pbt/runtest1 - proto_alpha__lib_protocol__pbt2: > - @src/proto_alpha/lib_protocol/test/pbt/runtest2 - proto_alpha__lib_protocol__pbt3: > - @src/proto_alpha/lib_protocol/test/pbt/runtest3 proto_alpha: > @src/proto_alpha/lib_dal/runtest parallel: @@ -147,9 +123,6 @@ unit:alpha: - proto_alpha__lib_protocol__1 - proto_alpha__lib_protocol__2 - proto_alpha__lib_protocol__3 - - proto_alpha__lib_protocol__pbt1 - - proto_alpha__lib_protocol__pbt2 - - proto_alpha__lib_protocol__pbt3 - proto_alpha script: - scripts/test_wrapper.sh $TEST_TARGETS ${!TEST_TARGETS} diff --git a/manifest/main.ml b/manifest/main.ml index 0c6a768f5e55..a12df2f9b850 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4049,19 +4049,7 @@ end = struct ] |> List.filter_map (fun (i, n, b) -> if b then Some (i, n) else None) in - let dune = - (* FIXME: https://gitlab.com/tezos/tezos/-/issues/1265 - Once those tests are ported to Tezt we can remove those aliases - and just use Tezt's auto-balancing. But this requires making QCheck - work with Tezt first. *) - let make_alias (index, test) = - Dune.alias_rule - ~action:(Dune.run_exe test []) - (sf "runtest%d" index) - in - Dune.of_list (List.map make_alias list) - in - tests + tezt (List.map snd list) ~synopsis:"Tezos/Protocol: tests for economic-protocol definition" ~path:(path // "lib_protocol/test/pbt") @@ -4080,7 +4068,7 @@ end = struct octez_merkle_proof_encoding; octez_test_helpers |> open_; test_helpers |> if_some |> open_; - alcotest; + alcotezt; qcheck_alcotest; octez_client_base |> if_ N.(number <= 012); octez_benchmark; @@ -4091,7 +4079,6 @@ end = struct octez_base_test_helpers |> if_ N.(number >= 016) |> open_; parameters |> if_some |> if_ N.(number >= 016) |> open_; ] - ~dune in let _unit = test diff --git a/opam/tezos-protocol-015-PtLimaPt-tests.opam b/opam/tezos-protocol-015-PtLimaPt-tests.opam index c2575aebfe98..99da1bf191e7 100644 --- a/opam/tezos-protocol-015-PtLimaPt-tests.opam +++ b/opam/tezos-protocol-015-PtLimaPt-tests.opam @@ -25,7 +25,6 @@ depends: [ "tezos-test-helpers" {with-test} "tezt" { with-test & >= "3.0.0" } "tezos-context" {with-test} - "alcotest" { with-test & >= "1.5.0" } "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} "tezos-stdlib-unix" {with-test} diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index f7f2a92e7e1f..a93eb6870996 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -25,17 +25,16 @@ depends: [ "tezos-test-helpers" {with-test} "tezt" { with-test & >= "3.0.0" } "tezos-context" {with-test} - "alcotest" { with-test & >= "1.5.0" } - "tezos-smart-rollup-016-PtMumbai" {with-test} - "tezos-crypto-dal" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-stdlib" {with-test} + "tezos-crypto-dal" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} "octez-alcotezt" {with-test} + "tezos-smart-rollup-016-PtMumbai" {with-test} "tezt-tezos" {with-test} ] build: [ diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 158cbd167292..15d4df922b42 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -25,17 +25,16 @@ depends: [ "tezos-test-helpers" {with-test} "tezt" { with-test & >= "3.0.0" } "tezos-context" {with-test} - "alcotest" { with-test & >= "1.5.0" } - "tezos-smart-rollup-alpha" {with-test} - "tezos-crypto-dal" {with-test} "tezos-client-base" {with-test} "tezos-protocol-environment" {with-test} "tezos-stdlib-unix" {with-test} "tezos-scoru-wasm-helpers" {with-test} "tezos-stdlib" {with-test} + "tezos-crypto-dal" {with-test} "tezos-scoru-wasm" {with-test} "tezos-webassembly-interpreter-extra" {with-test} "octez-alcotezt" {with-test} + "tezos-smart-rollup-alpha" {with-test} "tezt-tezos" {with-test} ] build: [ diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune index aedbcc042504..6098ee2672a7 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune @@ -1,23 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executables - (names - liquidity_baking_pbt - saturation_fuzzing - test_merkle_list - test_gas_properties - test_sampler - test_script_comparison - test_tez_repr - test_tx_rollup_l2_encoding - test_bitset - test_sc_rollup_tick_repr - test_sc_rollup_encoding - test_carbonated_map - test_zk_rollup_encoding - test_compare_operations) +(library + (name src_proto_015_PtLimaPt_lib_protocol_test_pbt_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-micheline tezos-client-015-PtLimaPt @@ -25,119 +13,56 @@ tezos-context.merkle_proof_encoding tezos-test-helpers tezos-015-PtLimaPt-test-helpers - alcotest + octez-alcotezt qcheck-alcotest tezos-benchmark tezos-benchmark-015-PtLimaPt tezos-benchmark-type-inference-015-PtLimaPt) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_micheline -open Tezos_client_015_PtLimaPt -open Tezos_protocol_015_PtLimaPt -open Tezos_test_helpers -open Tezos_015_PtLimaPt_test_helpers + -open Octez_alcotezt -open Tezos_benchmark_015_PtLimaPt - -open Tezos_benchmark_type_inference_015_PtLimaPt)) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./liquidity_baking_pbt.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./saturation_fuzzing.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_merkle_list.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_gas_properties.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_sampler.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_script_comparison.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_tez_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_tx_rollup_l2_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_bitset.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_sc_rollup_tick_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_sc_rollup_encoding.exe}))) + -open Tezos_benchmark_type_inference_015_PtLimaPt) + (modules + liquidity_baking_pbt + saturation_fuzzing + test_merkle_list + test_gas_properties + test_sampler + test_script_comparison + test_tez_repr + test_tx_rollup_l2_encoding + test_bitset + test_sc_rollup_tick_repr + test_sc_rollup_encoding + test_carbonated_map + test_zk_rollup_encoding + test_compare_operations)) -(rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_carbonated_map.exe}))) +(executable + (name main) + (libraries + src_proto_015_PtLimaPt_lib_protocol_test_pbt_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_zk_rollup_encoding.exe}))) + (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-protocol-015-PtLimaPt-tests) - (action (run %{dep:./test_compare_operations.exe}))) - -(rule (alias runtest1) (action (run %{exe:liquidity_baking_pbt.exe}))) - -(rule (alias runtest1) (action (run %{exe:saturation_fuzzing.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_merkle_list.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_gas_properties.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sampler.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_script_comparison.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_tez_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_tx_rollup_l2_encoding.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_bitset.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_tick_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_carbonated_map.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_zk_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_compare_operations.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/liquidity_baking_pbt.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/liquidity_baking_pbt.ml index fbfbbf2365a1..646e889ff8d6 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/liquidity_baking_pbt.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/liquidity_baking_pbt.ml @@ -315,6 +315,7 @@ let _ = Alcotest.run "protocol > pbt > liquidity baking" [ - ("Machines Cross-Validation", qcheck_wrap machine_validation_tests); - ("Economic Properties", qcheck_wrap economic_tests); + ( Protocol.name ^ ": Machines Cross-Validation", + qcheck_wrap machine_validation_tests ); + (Protocol.name ^ ": Economic Properties", qcheck_wrap economic_tests); ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/saturation_fuzzing.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/saturation_fuzzing.ml index 1d7199d13388..2f2134a4275d 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/saturation_fuzzing.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/saturation_fuzzing.ml @@ -192,10 +192,10 @@ let () = Alcotest.run "protocol > pbt > saturation" [ - ("add", qcheck_wrap tests_add); - ("mul", qcheck_wrap tests_mul); - ("sub", qcheck_wrap tests_sub); - ("add and sub", qcheck_wrap tests_add_sub); - ("sqrt", qcheck_wrap tests_sqrt); - ("<= and >=", qcheck_wrap tests_boundaries); + (Protocol.name ^ ": add", qcheck_wrap tests_add); + (Protocol.name ^ ": mul", qcheck_wrap tests_mul); + (Protocol.name ^ ": sub", qcheck_wrap tests_sub); + (Protocol.name ^ ": add and sub", qcheck_wrap tests_add_sub); + (Protocol.name ^ ": sqrt", qcheck_wrap tests_sqrt); + (Protocol.name ^ ": <= and >=", qcheck_wrap tests_boundaries); ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_bitset.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_bitset.ml index e3169aad1043..1f2d19722c3b 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_bitset.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_bitset.ml @@ -109,7 +109,7 @@ let () = Alcotest.run "bits" [ - ( "quantity", + ( Protocol.name ^ ": quantity", qcheck_wrap [ QCheck2.Test.make diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_carbonated_map.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_carbonated_map.ml index 248715999b14..13aa26770ed4 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_carbonated_map.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_carbonated_map.ml @@ -551,4 +551,4 @@ let () = let rand = Random.State.make [|0x1337533D; 71287309; 397060904|] in Alcotest.run "protocol > pbt > carbonated map" - [("Carbonated map", tests ~rand)] + [(Protocol.name ^ ": Carbonated map", tests ~rand)] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_compare_operations.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_compare_operations.ml index 3f106e556584..24d56e0bef8e 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_compare_operations.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_compare_operations.ml @@ -98,4 +98,6 @@ let tests = [test_compare_is_strorder] let () = Alcotest.run "Compare operations" - [("Compare_operations", Qcheck2_helpers.qcheck_wrap tests)] + [ + (Protocol.name ^ ": Compare_operations", Qcheck2_helpers.qcheck_wrap tests); + ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_gas_properties.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_gas_properties.ml index b8400568eb81..c497775eb124 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_gas_properties.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_gas_properties.ml @@ -141,4 +141,6 @@ let tests = ] let () = - Alcotest.run "protocol > pbt > gas" [("gas properties", qcheck_wrap tests)] + Alcotest.run + "protocol > pbt > gas" + [(Protocol.name ^ ": gas properties", qcheck_wrap tests)] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_merkle_list.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_merkle_list.ml index 16a179a677d7..9353869ca6c5 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_merkle_list.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_merkle_list.ml @@ -113,13 +113,13 @@ let () = Alcotest.run "Merkle list" [ - ( "scons_equiv", + ( Protocol.name ^ ": scons_equiv", qcheck_wrap [ test_scons_scons_tr_equiv ~count:1000; test_scons_compute_equiv ~count:1000; ] ); - ( "check_path", + ( Protocol.name ^ ": check_path", qcheck_wrap [test_check_path ~count:1000; test_check_path_wrong ~count:1000] ); ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sampler.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sampler.ml index 3e857198a33c..e357c3813ecc 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sampler.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sampler.ml @@ -267,4 +267,7 @@ let alias_z_test = let () = Alcotest.run "protocol > pbt > sampling" - [("sampling", qcheck_wrap [alias_float_test; alias_z_test])] + [ + ( Protocol.name ^ ": sampling", + qcheck_wrap [alias_float_test; alias_z_test] ); + ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_encoding.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_encoding.ml index e6d07236cbb9..ce3ac31a452f 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_encoding.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_encoding.ml @@ -212,4 +212,7 @@ let test_conflict = let tests = [test_commitment; test_versioned_commitment; test_game; test_conflict] -let () = Alcotest.run "SC rollup encoding" [("roundtrip", qcheck_wrap tests)] +let () = + Alcotest.run + "SC rollup encoding" + [(Protocol.name ^ ": roundtrip", qcheck_wrap tests)] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml index bba729fd93ef..417962de0f38 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml @@ -104,4 +104,6 @@ let tests = ] let () = - Alcotest.run "Tick_repr" [("Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] + Alcotest.run + "Tick_repr" + [(Protocol.name ^ ": Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_script_comparison.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_script_comparison.ml index 82288878c470..8db6c86d2d7c 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_script_comparison.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_script_comparison.ml @@ -348,10 +348,12 @@ let () = Alcotest.run "protocol > pbt > script_comparison" [ - ("compatible_with_reference", qcheck_wrap [test_compatible_with_reference]); - ("compatible_with_packing", qcheck_wrap [test_compatible_with_packing]); - ("reflexivity", qcheck_wrap [test_reflexivity]); - ("symmetry", qcheck_wrap [test_symmetry]); - ("transitivity", qcheck_wrap [test_transitivity]); - ("pack_unpack", qcheck_wrap [test_pack_unpack]); + ( Protocol.name ^ ": compatible_with_reference", + qcheck_wrap [test_compatible_with_reference] ); + ( Protocol.name ^ ": compatible_with_packing", + qcheck_wrap [test_compatible_with_packing] ); + (Protocol.name ^ ": reflexivity", qcheck_wrap [test_reflexivity]); + (Protocol.name ^ ": symmetry", qcheck_wrap [test_symmetry]); + (Protocol.name ^ ": transitivity", qcheck_wrap [test_transitivity]); + (Protocol.name ^ ": pack_unpack", qcheck_wrap [test_pack_unpack]); ] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tez_repr.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tez_repr.ml index 531983d153a9..ad53d602b69f 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tez_repr.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tez_repr.ml @@ -133,4 +133,4 @@ let tests = let () = Alcotest.run "protocol > pbt > tez_repr" - [("Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] + [(Protocol.name ^ ": Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml index cef46fea7eeb..44b8bd1b435e 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml @@ -278,8 +278,8 @@ let () = Alcotest.run "Compact_encoding" [ - ("quantity", qcheck_wrap [test_quantity ~count:100_000]); - ( "roundtrip", + (Protocol.name ^ ": quantity", qcheck_wrap [test_quantity ~count:100_000]); + ( Protocol.name ^ ": roundtrip", qcheck_wrap [ test_roundtrip diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_zk_rollup_encoding.ml b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_zk_rollup_encoding.ml index c0ace43dd6ca..243e46d064c0 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_zk_rollup_encoding.ml +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/test_zk_rollup_encoding.ml @@ -224,6 +224,6 @@ let () = Alcotest.run "ZK rollup encoding" [ - ("roundtrip", qcheck_wrap tests_roundtrip); - ("to_scalar", qcheck_wrap tests_to_scalar); + (Protocol.name ^ ": roundtrip", qcheck_wrap tests_roundtrip); + (Protocol.name ^ ": to_scalar", qcheck_wrap tests_to_scalar); ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/helpers/dal_helpers.ml b/src/proto_016_PtMumbai/lib_protocol/test/helpers/dal_helpers.ml index 74403d532910..c4f6659bf48a 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/helpers/dal_helpers.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/helpers/dal_helpers.ml @@ -37,7 +37,7 @@ let () = let open Data_encoding in register_error_kind `Permanent - ~id:"test_failure" + ~id:(Protocol.name ^ "_test_failure") ~title:"Test failure" ~description:"Test failure." ~pp:(fun ppf e -> Format.fprintf ppf "Test failure: %s" e) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune index 481928f59e62..2e2660dd75b5 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune @@ -1,27 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executables - (names - liquidity_baking_pbt - saturation_fuzzing - test_merkle_list - test_gas_properties - test_sampler - test_script_comparison - test_tez_repr - test_tx_rollup_l2_encoding - test_bitset - test_sc_rollup_tick_repr - test_sc_rollup_encoding - test_refutation_game - test_carbonated_map - test_zk_rollup_encoding - test_dal_slot_proof - test_compare_operations - test_operation_encoding - test_bytes_conversion) +(library + (name src_proto_016_PtMumbai_lib_protocol_test_pbt_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-micheline tezos-client-016-PtMumbai @@ -29,7 +13,7 @@ tezos-context.merkle_proof_encoding tezos-test-helpers tezos-016-PtMumbai-test-helpers - alcotest + octez-alcotezt qcheck-alcotest tezos-benchmark tezos-benchmark-016-PtMumbai @@ -38,146 +22,59 @@ tezos-crypto-dal tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_micheline -open Tezos_client_016_PtMumbai -open Tezos_protocol_016_PtMumbai -open Tezos_test_helpers -open Tezos_016_PtMumbai_test_helpers + -open Octez_alcotezt -open Tezos_benchmark_016_PtMumbai -open Tezos_benchmark_type_inference_016_PtMumbai -open Tezos_smart_rollup_016_PtMumbai -open Tezos_crypto_dal -open Tezos_base_test_helpers - -open Tezos_protocol_016_PtMumbai_parameters)) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./liquidity_baking_pbt.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./saturation_fuzzing.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_merkle_list.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_gas_properties.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_sampler.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_script_comparison.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_tez_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_tx_rollup_l2_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_bitset.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_sc_rollup_tick_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_sc_rollup_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_refutation_game.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_carbonated_map.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_zk_rollup_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_dal_slot_proof.exe}))) + -open Tezos_protocol_016_PtMumbai_parameters) + (modules + liquidity_baking_pbt + saturation_fuzzing + test_merkle_list + test_gas_properties + test_sampler + test_script_comparison + test_tez_repr + test_tx_rollup_l2_encoding + test_bitset + test_sc_rollup_tick_repr + test_sc_rollup_encoding + test_refutation_game + test_carbonated_map + test_zk_rollup_encoding + test_dal_slot_proof + test_compare_operations + test_operation_encoding + test_bytes_conversion)) -(rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_compare_operations.exe}))) +(executable + (name main) + (libraries + src_proto_016_PtMumbai_lib_protocol_test_pbt_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_operation_encoding.exe}))) + (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-protocol-016-PtMumbai-tests) - (action (run %{dep:./test_bytes_conversion.exe}))) - -(rule (alias runtest1) (action (run %{exe:liquidity_baking_pbt.exe}))) - -(rule (alias runtest1) (action (run %{exe:saturation_fuzzing.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_merkle_list.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_gas_properties.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sampler.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_script_comparison.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_tez_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_tx_rollup_l2_encoding.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_bitset.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_tick_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_refutation_game.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_carbonated_map.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_zk_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_dal_slot_proof.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_compare_operations.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_operation_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_bytes_conversion.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/liquidity_baking_pbt.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/liquidity_baking_pbt.ml index 52180232f363..a2ec51c16553 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/liquidity_baking_pbt.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/liquidity_baking_pbt.ml @@ -321,6 +321,7 @@ let () = Alcotest.run "protocol > pbt > liquidity baking" [ - ("Machines Cross-Validation", qcheck_wrap machine_validation_tests); - ("Economic Properties", qcheck_wrap economic_tests); + ( Protocol.name ^ ": Machines Cross-Validation", + qcheck_wrap machine_validation_tests ); + (Protocol.name ^ ": Economic Properties", qcheck_wrap economic_tests); ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/saturation_fuzzing.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/saturation_fuzzing.ml index 1d7199d13388..2f2134a4275d 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/saturation_fuzzing.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/saturation_fuzzing.ml @@ -192,10 +192,10 @@ let () = Alcotest.run "protocol > pbt > saturation" [ - ("add", qcheck_wrap tests_add); - ("mul", qcheck_wrap tests_mul); - ("sub", qcheck_wrap tests_sub); - ("add and sub", qcheck_wrap tests_add_sub); - ("sqrt", qcheck_wrap tests_sqrt); - ("<= and >=", qcheck_wrap tests_boundaries); + (Protocol.name ^ ": add", qcheck_wrap tests_add); + (Protocol.name ^ ": mul", qcheck_wrap tests_mul); + (Protocol.name ^ ": sub", qcheck_wrap tests_sub); + (Protocol.name ^ ": add and sub", qcheck_wrap tests_add_sub); + (Protocol.name ^ ": sqrt", qcheck_wrap tests_sqrt); + (Protocol.name ^ ": <= and >=", qcheck_wrap tests_boundaries); ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bitset.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bitset.ml index 39cdc4c2ee13..b6d2432808cc 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bitset.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bitset.ml @@ -98,7 +98,7 @@ let () = Alcotest.run "bits" [ - ( "quantity", + ( Protocol.name ^ ": quantity", qcheck_wrap [ QCheck2.Test.make diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bytes_conversion.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bytes_conversion.ml index 217ca544dee0..c3ba296fd119 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bytes_conversion.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_bytes_conversion.ml @@ -209,4 +209,7 @@ let tests = ] let () = - Alcotest.run "protocol > script_bytes > bytes and int/nat conversion " tests + Alcotest.run + ("protocol > script_bytes > " ^ Protocol.name + ^ ": bytes and int/nat conversion ") + tests diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_carbonated_map.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_carbonated_map.ml index d51841bd83f3..23fe8dca9309 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_carbonated_map.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_carbonated_map.ml @@ -551,4 +551,4 @@ let () = let rand = Random.State.make [|0x1337533D; 71287309; 397060904|] in Alcotest.run "protocol > pbt > carbonated map" - [("Carbonated map", tests ~rand)] + [(Protocol.name ^ ": Carbonated map", tests ~rand)] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_compare_operations.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_compare_operations.ml index d641433f9af0..a1beeb078c8c 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_compare_operations.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_compare_operations.ml @@ -98,4 +98,6 @@ let tests = [test_compare_is_strorder] let () = Alcotest.run "Compare operations" - [("Compare_operations", Qcheck2_helpers.qcheck_wrap tests)] + [ + (Protocol.name ^ ": Compare_operations", Qcheck2_helpers.qcheck_wrap tests); + ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_dal_slot_proof.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_dal_slot_proof.ml index 4f0663f7b4bb..e18c6609f680 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_dal_slot_proof.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_dal_slot_proof.ml @@ -201,7 +201,13 @@ struct ] let tests = - [(Format.sprintf "[%s] Dal slots refutation" Parameters.name, tests)] + [ + ( Format.sprintf + "[%s: %s] Dal slots refutation" + Protocol.name + Parameters.name, + tests ); + ] end let () = @@ -213,4 +219,5 @@ let () = let dal_parameters = constants_test.dal end) in - Alcotest_lwt.run "Refutation_game" Test.tests |> Lwt_main.run + Alcotest_lwt.run (Protocol.name ^ ": Dal slots refutation game") Test.tests + |> Lwt_main.run diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_gas_properties.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_gas_properties.ml index b8400568eb81..c497775eb124 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_gas_properties.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_gas_properties.ml @@ -141,4 +141,6 @@ let tests = ] let () = - Alcotest.run "protocol > pbt > gas" [("gas properties", qcheck_wrap tests)] + Alcotest.run + "protocol > pbt > gas" + [(Protocol.name ^ ": gas properties", qcheck_wrap tests)] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_merkle_list.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_merkle_list.ml index 16a179a677d7..9353869ca6c5 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_merkle_list.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_merkle_list.ml @@ -113,13 +113,13 @@ let () = Alcotest.run "Merkle list" [ - ( "scons_equiv", + ( Protocol.name ^ ": scons_equiv", qcheck_wrap [ test_scons_scons_tr_equiv ~count:1000; test_scons_compute_equiv ~count:1000; ] ); - ( "check_path", + ( Protocol.name ^ ": check_path", qcheck_wrap [test_check_path ~count:1000; test_check_path_wrong ~count:1000] ); ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_operation_encoding.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_operation_encoding.ml index 0f02ca9ccfbf..dfb486405418 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_operation_encoding.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_operation_encoding.ml @@ -63,4 +63,4 @@ let () = let qcheck_wrap = qcheck_wrap ~rand:(Random.State.make_self_init ()) in Alcotest.run "Operation_encoding" - [("roundtrip", qcheck_wrap [test_operation])] + [(Protocol.name ^ ": roundtrip", qcheck_wrap [test_operation])] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_refutation_game.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_refutation_game.ml index 17467ee33b83..49a75834598f 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_refutation_game.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_refutation_game.ml @@ -1823,4 +1823,4 @@ let tests = let tests = [tests; Dissection.tests] -let () = Alcotest.run "Refutation_game" tests +let () = Alcotest.run (Protocol.name ^ ": Refutation_game") tests diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sampler.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sampler.ml index 3e857198a33c..e357c3813ecc 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sampler.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sampler.ml @@ -267,4 +267,7 @@ let alias_z_test = let () = Alcotest.run "protocol > pbt > sampling" - [("sampling", qcheck_wrap [alias_float_test; alias_z_test])] + [ + ( Protocol.name ^ ": sampling", + qcheck_wrap [alias_float_test; alias_z_test] ); + ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_encoding.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_encoding.ml index 869db23667e2..8b11d8710049 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_encoding.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_encoding.ml @@ -288,4 +288,7 @@ let tests = test_inbox_message; ] -let () = Alcotest.run "SC rollup encoding" [("roundtrip", qcheck_wrap tests)] +let () = + Alcotest.run + "SC rollup encoding" + [(Protocol.name ^ ": roundtrip", qcheck_wrap tests)] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml index bba729fd93ef..417962de0f38 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml @@ -104,4 +104,6 @@ let tests = ] let () = - Alcotest.run "Tick_repr" [("Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] + Alcotest.run + "Tick_repr" + [(Protocol.name ^ ": Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_script_comparison.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_script_comparison.ml index 3b5a68bff87b..a50e46eaec82 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_script_comparison.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_script_comparison.ml @@ -346,10 +346,12 @@ let () = Alcotest.run "protocol > pbt > script_comparison" [ - ("compatible_with_reference", qcheck_wrap [test_compatible_with_reference]); - ("compatible_with_packing", qcheck_wrap [test_compatible_with_packing]); - ("reflexivity", qcheck_wrap [test_reflexivity]); - ("symmetry", qcheck_wrap [test_symmetry]); - ("transitivity", qcheck_wrap [test_transitivity]); - ("pack_unpack", qcheck_wrap [test_pack_unpack]); + ( Protocol.name ^ ": compatible_with_reference", + qcheck_wrap [test_compatible_with_reference] ); + ( Protocol.name ^ ": compatible_with_packing", + qcheck_wrap [test_compatible_with_packing] ); + (Protocol.name ^ ": reflexivity", qcheck_wrap [test_reflexivity]); + (Protocol.name ^ ": symmetry", qcheck_wrap [test_symmetry]); + (Protocol.name ^ ": transitivity", qcheck_wrap [test_transitivity]); + (Protocol.name ^ ": pack_unpack", qcheck_wrap [test_pack_unpack]); ] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tez_repr.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tez_repr.ml index 531983d153a9..ad53d602b69f 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tez_repr.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tez_repr.ml @@ -133,4 +133,4 @@ let tests = let () = Alcotest.run "protocol > pbt > tez_repr" - [("Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] + [(Protocol.name ^ ": Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml index 408504364c5d..c48a3bc843ae 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml @@ -280,8 +280,8 @@ let () = Alcotest.run "Compact_encoding" [ - ("quantity", qcheck_wrap [test_quantity ~count:100_000]); - ( "roundtrip", + (Protocol.name ^ ": quantity", qcheck_wrap [test_quantity ~count:100_000]); + ( Protocol.name ^ ": roundtrip", qcheck_wrap [ test_roundtrip diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_zk_rollup_encoding.ml b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_zk_rollup_encoding.ml index df5be1fb0d9d..dd1f404f58bf 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_zk_rollup_encoding.ml +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/test_zk_rollup_encoding.ml @@ -224,6 +224,6 @@ let () = Alcotest.run "ZK rollup encoding" [ - ("roundtrip", qcheck_wrap tests_roundtrip); - ("to_scalar", qcheck_wrap tests_to_scalar); + (Protocol.name ^ ": roundtrip", qcheck_wrap tests_roundtrip); + (Protocol.name ^ ": to_scalar", qcheck_wrap tests_to_scalar); ] diff --git a/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml b/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml index a5bd9846c600..7eb5398dcab0 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/dal_helpers.ml @@ -38,7 +38,7 @@ let () = let open Data_encoding in register_error_kind `Permanent - ~id:"test_failure" + ~id:(Protocol.name ^ "_test_failure") ~title:"Test failure" ~description:"Test failure." ~pp:(fun ppf e -> Format.fprintf ppf "Test failure: %s" e) diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index a1ca1c818fa8..3c8ac4126d05 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -1,26 +1,11 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executables - (names - liquidity_baking_pbt - saturation_fuzzing - test_merkle_list - test_gas_properties - test_sampler - test_script_comparison - test_tez_repr - test_bitset - test_sc_rollup_tick_repr - test_sc_rollup_encoding - test_refutation_game - test_carbonated_map - test_zk_rollup_encoding - test_dal_slot_proof - test_compare_operations - test_operation_encoding - test_bytes_conversion) +(library + (name src_proto_alpha_lib_protocol_test_pbt_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries + tezt.core tezos-base tezos-micheline tezos-client-alpha @@ -28,7 +13,7 @@ tezos-context.merkle_proof_encoding tezos-test-helpers tezos-alpha-test-helpers - alcotest + octez-alcotezt qcheck-alcotest tezos-benchmark tezos-benchmark-alpha @@ -37,139 +22,58 @@ tezos-crypto-dal tezos-base-test-helpers tezos-protocol-alpha.parameters) - (link_flags - (:standard) - (:include %{workspace_root}/macos-link-flags.sexp)) + (library_flags (:standard -linkall)) (flags (:standard) + -open Tezt_core + -open Tezt_core.Base -open Tezos_base.TzPervasives -open Tezos_micheline -open Tezos_client_alpha -open Tezos_protocol_alpha -open Tezos_test_helpers -open Tezos_alpha_test_helpers + -open Octez_alcotezt -open Tezos_benchmark_alpha -open Tezos_benchmark_type_inference_alpha -open Tezos_smart_rollup_alpha -open Tezos_crypto_dal -open Tezos_base_test_helpers - -open Tezos_protocol_alpha_parameters)) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./liquidity_baking_pbt.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./saturation_fuzzing.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_merkle_list.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_gas_properties.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_sampler.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_script_comparison.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_tez_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_bitset.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_sc_rollup_tick_repr.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_sc_rollup_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_refutation_game.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_carbonated_map.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_zk_rollup_encoding.exe}))) - -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_dal_slot_proof.exe}))) + -open Tezos_protocol_alpha_parameters) + (modules + liquidity_baking_pbt + saturation_fuzzing + test_merkle_list + test_gas_properties + test_sampler + test_script_comparison + test_tez_repr + test_bitset + test_sc_rollup_tick_repr + test_sc_rollup_encoding + test_refutation_game + test_carbonated_map + test_zk_rollup_encoding + test_dal_slot_proof + test_compare_operations + test_operation_encoding + test_bytes_conversion)) -(rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_compare_operations.exe}))) +(executable + (name main) + (libraries + src_proto_alpha_lib_protocol_test_pbt_tezt_lib + tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_operation_encoding.exe}))) + (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-protocol-alpha-tests) - (action (run %{dep:./test_bytes_conversion.exe}))) - -(rule (alias runtest1) (action (run %{exe:liquidity_baking_pbt.exe}))) - -(rule (alias runtest1) (action (run %{exe:saturation_fuzzing.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_merkle_list.exe}))) - -(rule (alias runtest1) (action (run %{exe:test_gas_properties.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sampler.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_script_comparison.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_tez_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_bitset.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_tick_repr.exe}))) - -(rule (alias runtest2) (action (run %{exe:test_sc_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_refutation_game.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_carbonated_map.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_zk_rollup_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_dal_slot_proof.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_compare_operations.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_operation_encoding.exe}))) - -(rule (alias runtest3) (action (run %{exe:test_bytes_conversion.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/src/proto_alpha/lib_protocol/test/pbt/liquidity_baking_pbt.ml b/src/proto_alpha/lib_protocol/test/pbt/liquidity_baking_pbt.ml index 52180232f363..a2ec51c16553 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/liquidity_baking_pbt.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/liquidity_baking_pbt.ml @@ -321,6 +321,7 @@ let () = Alcotest.run "protocol > pbt > liquidity baking" [ - ("Machines Cross-Validation", qcheck_wrap machine_validation_tests); - ("Economic Properties", qcheck_wrap economic_tests); + ( Protocol.name ^ ": Machines Cross-Validation", + qcheck_wrap machine_validation_tests ); + (Protocol.name ^ ": Economic Properties", qcheck_wrap economic_tests); ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml b/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml index 1d7199d13388..2f2134a4275d 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/saturation_fuzzing.ml @@ -192,10 +192,10 @@ let () = Alcotest.run "protocol > pbt > saturation" [ - ("add", qcheck_wrap tests_add); - ("mul", qcheck_wrap tests_mul); - ("sub", qcheck_wrap tests_sub); - ("add and sub", qcheck_wrap tests_add_sub); - ("sqrt", qcheck_wrap tests_sqrt); - ("<= and >=", qcheck_wrap tests_boundaries); + (Protocol.name ^ ": add", qcheck_wrap tests_add); + (Protocol.name ^ ": mul", qcheck_wrap tests_mul); + (Protocol.name ^ ": sub", qcheck_wrap tests_sub); + (Protocol.name ^ ": add and sub", qcheck_wrap tests_add_sub); + (Protocol.name ^ ": sqrt", qcheck_wrap tests_sqrt); + (Protocol.name ^ ": <= and >=", qcheck_wrap tests_boundaries); ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml b/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml index 0931bda11d10..9215b9eaf038 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_bitset.ml @@ -96,7 +96,7 @@ let () = Alcotest.run "bits" [ - ( "quantity", + ( Protocol.name ^ ": quantity", qcheck_wrap [ QCheck2.Test.make diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_bytes_conversion.ml b/src/proto_alpha/lib_protocol/test/pbt/test_bytes_conversion.ml index 217ca544dee0..c3ba296fd119 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_bytes_conversion.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_bytes_conversion.ml @@ -209,4 +209,7 @@ let tests = ] let () = - Alcotest.run "protocol > script_bytes > bytes and int/nat conversion " tests + Alcotest.run + ("protocol > script_bytes > " ^ Protocol.name + ^ ": bytes and int/nat conversion ") + tests diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml b/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml index c0ec7ac0603d..46d9ab5ee632 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml @@ -547,4 +547,4 @@ let () = let rand = Random.State.make [|0x1337533D; 71287309; 397060904|] in Alcotest.run "protocol > pbt > carbonated map" - [("Carbonated map", tests ~rand)] + [(Protocol.name ^ ": Carbonated map", tests ~rand)] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_compare_operations.ml b/src/proto_alpha/lib_protocol/test/pbt/test_compare_operations.ml index d641433f9af0..a1beeb078c8c 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_compare_operations.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_compare_operations.ml @@ -98,4 +98,6 @@ let tests = [test_compare_is_strorder] let () = Alcotest.run "Compare operations" - [("Compare_operations", Qcheck2_helpers.qcheck_wrap tests)] + [ + (Protocol.name ^ ": Compare_operations", Qcheck2_helpers.qcheck_wrap tests); + ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml b/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml index 899a53fe8e77..575d5c0f66e8 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_dal_slot_proof.ml @@ -233,7 +233,13 @@ struct ] let tests = - [(Format.sprintf "[%s] Dal slots refutation" Parameters.name, tests)] + [ + ( Format.sprintf + "[%s: %s] Dal slots refutation" + Protocol.name + Parameters.name, + tests ); + ] end let () = @@ -245,4 +251,5 @@ let () = let dal_parameters = constants_test.dal end) in - Alcotest_lwt.run "Refutation_game" Test.tests |> Lwt_main.run + Alcotest_lwt.run (Protocol.name ^ ": Dal slots refutation game") Test.tests + |> Lwt_main.run diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_gas_properties.ml b/src/proto_alpha/lib_protocol/test/pbt/test_gas_properties.ml index b8400568eb81..c497775eb124 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_gas_properties.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_gas_properties.ml @@ -141,4 +141,6 @@ let tests = ] let () = - Alcotest.run "protocol > pbt > gas" [("gas properties", qcheck_wrap tests)] + Alcotest.run + "protocol > pbt > gas" + [(Protocol.name ^ ": gas properties", qcheck_wrap tests)] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml b/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml index 16a179a677d7..9353869ca6c5 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml @@ -113,13 +113,13 @@ let () = Alcotest.run "Merkle list" [ - ( "scons_equiv", + ( Protocol.name ^ ": scons_equiv", qcheck_wrap [ test_scons_scons_tr_equiv ~count:1000; test_scons_compute_equiv ~count:1000; ] ); - ( "check_path", + ( Protocol.name ^ ": check_path", qcheck_wrap [test_check_path ~count:1000; test_check_path_wrong ~count:1000] ); ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_operation_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_operation_encoding.ml index 0f02ca9ccfbf..dfb486405418 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_operation_encoding.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_operation_encoding.ml @@ -63,4 +63,4 @@ let () = let qcheck_wrap = qcheck_wrap ~rand:(Random.State.make_self_init ()) in Alcotest.run "Operation_encoding" - [("roundtrip", qcheck_wrap [test_operation])] + [(Protocol.name ^ ": roundtrip", qcheck_wrap [test_operation])] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml index 0af37babd3f9..e7928e4443f5 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_refutation_game.ml @@ -1794,4 +1794,4 @@ let tests = let tests = [tests; Dissection.tests] -let () = Alcotest.run "Refutation_game" tests +let () = Alcotest.run (Protocol.name ^ ": Refutation_game") tests diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_sampler.ml b/src/proto_alpha/lib_protocol/test/pbt/test_sampler.ml index 3e857198a33c..e357c3813ecc 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_sampler.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_sampler.ml @@ -267,4 +267,7 @@ let alias_z_test = let () = Alcotest.run "protocol > pbt > sampling" - [("sampling", qcheck_wrap [alias_float_test; alias_z_test])] + [ + ( Protocol.name ^ ": sampling", + qcheck_wrap [alias_float_test; alias_z_test] ); + ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml index 52cb5f397732..cbe883a48a47 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_encoding.ml @@ -290,4 +290,7 @@ let tests = test_inbox_message; ] -let () = Alcotest.run "SC rollup encoding" [("roundtrip", qcheck_wrap tests)] +let () = + Alcotest.run + "SC rollup encoding" + [(Protocol.name ^ ": roundtrip", qcheck_wrap tests)] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml index bba729fd93ef..417962de0f38 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_sc_rollup_tick_repr.ml @@ -104,4 +104,6 @@ let tests = ] let () = - Alcotest.run "Tick_repr" [("Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] + Alcotest.run + "Tick_repr" + [(Protocol.name ^ ": Tick_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_script_comparison.ml b/src/proto_alpha/lib_protocol/test/pbt/test_script_comparison.ml index d9383feccef0..a786095190f9 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_script_comparison.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_script_comparison.ml @@ -345,10 +345,12 @@ let () = Alcotest.run "protocol > pbt > script_comparison" [ - ("compatible_with_reference", qcheck_wrap [test_compatible_with_reference]); - ("compatible_with_packing", qcheck_wrap [test_compatible_with_packing]); - ("reflexivity", qcheck_wrap [test_reflexivity]); - ("symmetry", qcheck_wrap [test_symmetry]); - ("transitivity", qcheck_wrap [test_transitivity]); - ("pack_unpack", qcheck_wrap [test_pack_unpack]); + ( Protocol.name ^ ": compatible_with_reference", + qcheck_wrap [test_compatible_with_reference] ); + ( Protocol.name ^ ": compatible_with_packing", + qcheck_wrap [test_compatible_with_packing] ); + (Protocol.name ^ ": reflexivity", qcheck_wrap [test_reflexivity]); + (Protocol.name ^ ": symmetry", qcheck_wrap [test_symmetry]); + (Protocol.name ^ ": transitivity", qcheck_wrap [test_transitivity]); + (Protocol.name ^ ": pack_unpack", qcheck_wrap [test_pack_unpack]); ] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_tez_repr.ml b/src/proto_alpha/lib_protocol/test/pbt/test_tez_repr.ml index 531983d153a9..ad53d602b69f 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_tez_repr.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_tez_repr.ml @@ -133,4 +133,4 @@ let tests = let () = Alcotest.run "protocol > pbt > tez_repr" - [("Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] + [(Protocol.name ^ ": Tez_repr", Qcheck2_helpers.qcheck_wrap tests)] diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_zk_rollup_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_zk_rollup_encoding.ml index af73f250bd46..c60ab6f0bbc7 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/test_zk_rollup_encoding.ml +++ b/src/proto_alpha/lib_protocol/test/pbt/test_zk_rollup_encoding.ml @@ -224,6 +224,6 @@ let () = Alcotest.run "ZK rollup encoding" [ - ("roundtrip", qcheck_wrap tests_roundtrip); - ("to_scalar", qcheck_wrap tests_to_scalar); + (Protocol.name ^ ": roundtrip", qcheck_wrap tests_roundtrip); + (Protocol.name ^ ": to_scalar", qcheck_wrap tests_to_scalar); ] diff --git a/tezt/tests/dune b/tezt/tests/dune index 4e2ee32990b0..27b6ca20d56b 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -14,16 +14,19 @@ tezos-stdlib-unix tezos-protocol-alpha src_proto_alpha_lib_protocol_test_regression_tezt_lib + src_proto_alpha_lib_protocol_test_pbt_tezt_lib src_proto_alpha_lib_protocol_test_integration_operations_tezt_lib src_proto_alpha_lib_plugin_test_tezt_lib src_proto_alpha_lib_delegate_test_tezt_lib src_proto_alpha_lib_client_test_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib + src_proto_016_PtMumbai_lib_protocol_test_pbt_tezt_lib src_proto_016_PtMumbai_lib_protocol_test_integration_operations_tezt_lib src_proto_016_PtMumbai_lib_plugin_test_tezt_lib src_proto_016_PtMumbai_lib_delegate_test_tezt_lib src_proto_016_PtMumbai_lib_client_test_tezt_lib src_proto_015_PtLimaPt_lib_protocol_test_regression_tezt_lib + src_proto_015_PtLimaPt_lib_protocol_test_pbt_tezt_lib src_proto_015_PtLimaPt_lib_protocol_test_integration_operations_tezt_lib src_proto_015_PtLimaPt_lib_plugin_test_tezt_lib src_proto_015_PtLimaPt_lib_delegate_test_tezt_lib -- GitLab