From 98d4fba12d6456e596b0d8cabe16a09dca123f91 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 26 Apr 2023 08:05:53 +0200 Subject: [PATCH 1/7] CI: remove job [unit:lib-store-unix] This job was created in !8328 to isolate of the store jobs, under suspicion of flakiness. However, since then, this job has not been flaky. Also, in !8291, when the store tests were ported to Alcotezt, they started running with the other Tezts - consequently the store tests now run twice. Consequently, removing this job. --- .gitlab/ci/jobs/coverage/coverage.yml | 1 - .gitlab/ci/jobs/test/unit.yml | 6 ------ 2 files changed, 7 deletions(-) diff --git a/.gitlab/ci/jobs/coverage/coverage.yml b/.gitlab/ci/jobs/coverage/coverage.yml index 9e30a4e2339c..b5b5d8c175d8 100644 --- a/.gitlab/ci/jobs/coverage/coverage.yml +++ b/.gitlab/ci/jobs/coverage/coverage.yml @@ -56,7 +56,6 @@ unified_coverage: - "tezt 39/40" - "tezt 40/40" - "unit:non-proto-x86_64" - - "unit:lib-store-unix" script: # On the development branches, we compute coverage - ./scripts/ci/report_coverage.sh diff --git a/.gitlab/ci/jobs/test/unit.yml b/.gitlab/ci/jobs/test/unit.yml index e96bca060e13..99fb86f5a2de 100644 --- a/.gitlab/ci/jobs/test/unit.yml +++ b/.gitlab/ci/jobs/test/unit.yml @@ -47,12 +47,6 @@ unit:non-proto-x86_64: variables: MAKE_TARGETS: test-nonproto-unit -unit:lib-store-unix: - extends: - - .unit_test_template_x86_64_coverage - variables: - MAKE_TARGETS: test-lib-store-unit - unit:webassembly-x86_64: extends: - .unit_test_template_x86_64 -- GitLab From 109135e1322c166769336c40687a6f1c2975a39a Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 25 Apr 2023 15:18:45 +0200 Subject: [PATCH 2/7] Manifest: Add [enabled_if] to [test] and [tests] The [enabled_if] clause is added to the [runtest] alias optionally generated by these functions. --- manifest/manifest.ml | 45 ++++++++++++++++++++++++++++++------------- manifest/manifest.mli | 9 +++++++-- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 116e62fa4749..ec014ce9517f 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -295,7 +295,7 @@ module Dune = struct ] let alias_rule ?(deps = Stdlib.List.[]) ?(alias_deps = Stdlib.List.[]) - ?deps_dune ?action ?locks ?package name = + ?deps_dune ?action ?locks ?package ?enabled_if name = let deps = match (deps, alias_deps, deps_dune) with | _ :: _, _, Some _ | _, _ :: _, Some _ -> @@ -314,6 +314,7 @@ module Dune = struct (opt package @@ fun x -> [S "package"; S x]); (match deps with [] -> E | _ -> S "deps" :: deps); (opt locks @@ fun locks -> [S "locks"; S locks]); + (opt enabled_if @@ fun enabled_if -> [S "enabled_if"; enabled_if]); [ S "action"; (match action with None -> [S "progn"] | Some action -> action); @@ -330,8 +331,8 @@ module Dune = struct let glob_files_rec expr = [S "glob_files_rec"; S expr] - let runtest ?(alias = "runtest") ?action ?package ?locks ~dep_files ~dep_globs - ~dep_globs_rec name = + let runtest ?(alias = "runtest") ?action ?package ?locks ?enabled_if + ~dep_files ~dep_globs ~dep_globs_rec name = let deps_dune = let files = List.map (fun s -> S s) dep_files in let globs = List.map glob_files dep_globs in @@ -343,16 +344,17 @@ module Dune = struct let action = Option.value ~default:[S "run"; S ("%{dep:./" ^ name ^ ".exe}")] action in - alias_rule alias ?package ?deps_dune ?locks ~action + alias_rule alias ?package ?deps_dune ?locks ?enabled_if ~action - let runtest_js ?(alias = "runtest_js") ?package ?locks ~dep_files ~dep_globs - ~dep_globs_rec name = + let runtest_js ?(alias = "runtest_js") ?package ?locks ?enabled_if ~dep_files + ~dep_globs ~dep_globs_rec name = let action = [S "run"; S "node"; S ("%{dep:./" ^ name ^ ".bc.js}")] in runtest ~alias ~action ?package ?locks + ?enabled_if ~dep_files ~dep_globs ~dep_globs_rec @@ -1008,6 +1010,7 @@ module Target = struct names : string Ne_list.t; runtest_alias : string option; locks : string option; + enabled_if : Dune.s_expr option; } type preprocessor_dep = File of string @@ -1534,8 +1537,9 @@ module Target = struct | Some modes -> List.mem Dune.Native modes in match (kind, opam, dep_files) with - | Test_executable {names; runtest_alias = Some alias; locks}, package, _ - -> + | ( Test_executable {names; runtest_alias = Some alias; locks; enabled_if}, + package, + _ ) -> let runtest_js_rules = if run_js then List.map @@ -1546,6 +1550,7 @@ module Target = struct ~dep_globs ~dep_globs_rec ?locks + ?enabled_if ?package name) (Ne_list.to_list names) @@ -1561,13 +1566,15 @@ module Target = struct ~dep_globs ~dep_globs_rec ?locks + ?enabled_if ?package name) (Ne_list.to_list names) else [] in runtest_rules @ runtest_js_rules - | ( Test_executable {names = name, _; runtest_alias = None; locks = _}, + | ( Test_executable + {names = name, _; runtest_alias = None; locks = _; enabled_if = _}, _, _ :: _ ) -> invalid_argf @@ -1685,18 +1692,30 @@ module Target = struct | [] -> invalid_argf "Target.private_exes: at least one name must be given" | head :: tail -> Private_executable (head, tail) - let test ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks = + let test ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks + ?enabled_if = + (match (alias, enabled_if, locks) with + | "", Some _, _ | "", _, Some _ -> + invalid_arg + "Target.tests: cannot specify enabled_if or locks without alias" + | _ -> ()) ; let runtest_alias = if alias = "" then None else Some alias in internal ?dep_files ?dep_globs ?dep_globs_rec @@ fun test_name -> - Test_executable {names = (test_name, []); runtest_alias; locks} + Test_executable {names = (test_name, []); runtest_alias; locks; enabled_if} - let tests ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks = + let tests ?(alias = "runtest") ?dep_files ?dep_globs ?dep_globs_rec ?locks + ?enabled_if = + (match (alias, enabled_if, locks) with + | "", Some _, _ | "", _, Some _ -> + invalid_arg + "Target.tests: cannot specify enabled_if or locks without alias" + | _ -> ()) ; let runtest_alias = if alias = "" then None else Some alias in internal ?dep_files ?dep_globs ?dep_globs_rec @@ fun test_names -> match test_names with | [] -> invalid_arg "Target.tests: at least one name must be given" | head :: tail -> - Test_executable {names = (head, tail); runtest_alias; locks} + Test_executable {names = (head, tail); runtest_alias; locks; enabled_if} let vendored_lib ?(released_on_opam = true) ?main_module ?(js_compatible = false) ?(npm_deps = []) name version = diff --git a/manifest/manifest.mli b/manifest/manifest.mli index e61d68dd85f0..1bd153333567 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -142,6 +142,8 @@ module Dune : sig This is important in particular for [runtest] rules, so that dune knows which tests to run when opam runs the tests for a package. + - [enabled_if] specifies the Dune [enabled_if] clause of this rule. + The last [string] argument is the name of the alias. For instance, if this name is [abc], you can build the rule with [dune build @abc]. *) val alias_rule : @@ -151,6 +153,7 @@ module Dune : sig ?action:s_expr -> ?locks:string -> ?package:string -> + ?enabled_if:s_expr -> string -> s_expr @@ -889,8 +892,8 @@ val private_exes : string list maker - [alias]: if non-empty, an alias is set up for the given test, named [alias]. Default is ["runtest"]. Note that for JS tests, ["_js"] is appended to this alias. Also note that if [alias] is non-empty, the target must belong to an opam package - (i.e. [~opam] must also be non-empty). If given, [locks] is set for this alias - (see {!Dune.alias_rule} for more information). + (i.e. [~opam] must also be non-empty). If given, the [enabled_if] and/or [locks] + clauses are added to this alias. - [dep_files]: a list of files to add as dependencies using [(deps (file ...))] in the [runtest] alias. @@ -909,6 +912,7 @@ val test : ?dep_globs:string list -> ?dep_globs_rec:string list -> ?locks:string -> + ?enabled_if:Dune.s_expr -> string maker (** Same as {!test} but with several names, to define multiple tests at once. *) @@ -918,6 +922,7 @@ val tests : ?dep_globs:string list -> ?dep_globs_rec:string list -> ?locks:string -> + ?enabled_if:Dune.s_expr -> string list maker (** Register a Tezt test. -- GitLab From 6b2bd8db677bfd553eb6e07282bd908e9a9f8647 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 26 Apr 2023 08:19:21 +0200 Subject: [PATCH 3/7] Manifest: tezts use [runtest] disabled in the CI Do not use a separate [runtezt] alias for [tezts]. Instead, use [runtest] as for other tests, but qualify it with an [enabled_if] clause so that we can disable it in the CI. The tezts are executed using the [tezt/tests/main.exe] entrypoint instead. --- manifest/manifest.ml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index ec014ce9517f..f64c4fb7180f 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -1919,7 +1919,14 @@ let register_tezt_targets ~make_tezt_exe = let (_ : Target.t option) = Target.test exe_name - ~alias:"runtezt" + (* Tezts can be deselected from the runtest alias by setting + the environment variable [RUNTEZTALIAS] to [false]. If + this environment variable is unset, or set to any value + other than [false], then they are selected. + + For more info on [%{env:VAR=VAL}] see + https://dune.readthedocs.io/en/stable/concepts.html#variables *) + ~enabled_if:Dune.[S "<>"; S "false"; S "%{env:RUNTEZTALIAS=true}"] ~path ~with_macos_security_framework ~opam -- GitLab From cb5434271db7396f3e82a7c671d3ff1617f7d5ff Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Tue, 25 Apr 2023 15:21:01 +0200 Subject: [PATCH 4/7] Manifest: update opam/dune files --- opam/octez-bls12-381-polynomial.opam | 1 - opam/octez-polynomial.opam | 1 - opam/tezos-baking-016-PtMumbai.opam | 1 - opam/tezos-baking-017-PtNairob.opam | 1 - opam/tezos-baking-alpha.opam | 1 - opam/tezos-base.opam | 1 - opam/tezos-benchmark-tests.opam | 1 - opam/tezos-clic.opam | 1 - opam/tezos-client-016-PtMumbai.opam | 1 - opam/tezos-client-017-PtNairob.opam | 1 - opam/tezos-client-alpha.opam | 1 - opam/tezos-client-base-unix.opam | 1 - opam/tezos-client-base.opam | 1 - opam/tezos-context.opam | 1 - opam/tezos-crypto-dal.opam | 1 - opam/tezos-crypto.opam | 1 - opam/tezos-dac-017-PtNairob.opam | 1 - opam/tezos-dac-alpha.opam | 1 - opam/tezos-dac-node-lib-test.opam | 1 - opam/tezos-dal-016-PtMumbai.opam | 1 - opam/tezos-dal-017-PtNairob.opam | 1 - opam/tezos-dal-alpha.opam | 1 - opam/tezos-error-monad.opam | 1 - opam/tezos-hacl.opam | 1 - opam/tezos-layer2-store.opam | 1 - opam/tezos-lazy-containers-tests.opam | 1 - opam/tezos-lwt-result-stdlib.opam | 1 - opam/tezos-micheline-rewriting.opam | 1 - opam/tezos-mockup.opam | 1 - opam/tezos-p2p.opam | 1 - opam/tezos-protocol-016-PtMumbai-tests.opam | 1 - opam/tezos-protocol-017-PtNairob-tests.opam | 1 - opam/tezos-protocol-alpha-tests.opam | 1 - opam/tezos-protocol-environment.opam | 1 - opam/tezos-protocol-plugin-016-PtMumbai-tests.opam | 1 - opam/tezos-protocol-plugin-017-PtNairob-tests.opam | 1 - opam/tezos-protocol-plugin-alpha-tests.opam | 1 - opam/tezos-proxy-server-config.opam | 1 - opam/tezos-proxy.opam | 1 - opam/tezos-requester.opam | 1 - opam/tezos-rpc-http-server.opam | 1 - opam/tezos-sc-rollup-node-test.opam | 1 - opam/tezos-shell-context-test.opam | 1 - opam/tezos-shell-services.opam | 1 - opam/tezos-shell.opam | 1 - opam/tezos-signer-backends.opam | 1 - opam/tezos-stdlib-unix.opam | 1 - opam/tezos-stdlib.opam | 1 - opam/tezos-store.opam | 1 - opam/tezos-tree-encoding-test.opam | 1 - opam/tezos-version.opam | 1 - opam/tezos-webassembly-interpreter.opam | 1 - opam/tezos-workers.opam | 1 - opam/tezt-tezos.opam | 1 - src/lib_base/test/dune | 6 ++++-- src/lib_base/unix/test/dune | 6 +++++- src/lib_benchmark/lib_micheline_rewriting/test/dune | 3 ++- src/lib_benchmark/test/dune | 3 ++- src/lib_bls12_381_polynomial/test/dune | 3 ++- src/lib_clic/test/dune | 6 +++++- src/lib_client_base/test/dune | 6 ++++-- src/lib_client_base_unix/test/dune | 3 ++- src/lib_context/memory/test/dune | 3 ++- src/lib_context/test/dune | 3 ++- src/lib_crypto/test-unix/dune | 6 +++++- src/lib_crypto/test/dune | 9 +++++++-- src/lib_crypto_dal/test/dune | 3 ++- src/lib_dac_node/test/dune | 3 ++- src/lib_error_monad/test/dune | 6 ++++-- src/lib_hacl/test/dune | 9 +++++++-- src/lib_layer2_store/test/dune | 3 ++- src/lib_lazy_containers/test/dune | 3 ++- src/lib_lwt_result_stdlib/test/dune | 3 ++- src/lib_mockup/test/dune | 6 +++++- src/lib_p2p/tezt/dune | 6 +++++- src/lib_polynomial/test/dune | 3 ++- src/lib_protocol_environment/test/dune | 3 ++- src/lib_protocol_environment/test_shell_context/dune | 3 ++- src/lib_proxy/test/dune | 6 +++++- src/lib_proxy/test_helpers/shell_services/test/dune | 6 +++++- src/lib_proxy_server_config/test/dune | 3 ++- src/lib_requester/test/dune | 3 ++- src/lib_rpc_http/test/dune | 3 ++- src/lib_sapling/test/dune | 3 ++- src/lib_shell/test/dune | 6 +++++- src/lib_shell_services/test/dune | 6 ++++-- src/lib_signer_backends/test/dune | 3 ++- src/lib_signer_backends/unix/test/dune | 3 ++- src/lib_stdlib/test-unix/dune | 6 +++++- src/lib_stdlib/test/dune | 9 +++++++-- src/lib_stdlib_unix/test/dune | 3 ++- src/lib_store/unix/test/dune | 6 +++++- src/lib_tree_encoding/test/dune | 3 ++- src/lib_version/test/dune | 6 ++++-- src/lib_webassembly/tests/dune | 3 ++- src/lib_workers/test/dune | 3 ++- src/proto_016_PtMumbai/lib_client/test/dune | 3 ++- src/proto_016_PtMumbai/lib_dal/test/dune | 3 ++- src/proto_016_PtMumbai/lib_delegate/test/dune | 3 ++- src/proto_016_PtMumbai/lib_plugin/test/dune | 3 ++- .../lib_protocol/test/integration/consensus/dune | 3 ++- .../lib_protocol/test/integration/dune | 3 ++- .../lib_protocol/test/integration/gas/dune | 3 ++- .../lib_protocol/test/integration/michelson/dune | 3 ++- .../lib_protocol/test/integration/operations/dune | 3 ++- .../lib_protocol/test/integration/validate/dune | 3 ++- src/proto_016_PtMumbai/lib_protocol/test/pbt/dune | 3 ++- src/proto_016_PtMumbai/lib_protocol/test/regression/dune | 3 ++- src/proto_016_PtMumbai/lib_protocol/test/unit/dune | 3 ++- src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune | 3 ++- src/proto_017_PtNairob/lib_client/test/dune | 3 ++- src/proto_017_PtNairob/lib_dac_plugin/test/dune | 3 ++- src/proto_017_PtNairob/lib_dal/test/dune | 3 ++- src/proto_017_PtNairob/lib_delegate/test/dune | 3 ++- src/proto_017_PtNairob/lib_plugin/test/dune | 3 ++- .../lib_protocol/test/integration/consensus/dune | 3 ++- .../lib_protocol/test/integration/dune | 3 ++- .../lib_protocol/test/integration/gas/dune | 3 ++- .../lib_protocol/test/integration/michelson/dune | 3 ++- .../lib_protocol/test/integration/operations/dune | 3 ++- .../lib_protocol/test/integration/validate/dune | 3 ++- src/proto_017_PtNairob/lib_protocol/test/pbt/dune | 3 ++- src/proto_017_PtNairob/lib_protocol/test/regression/dune | 3 ++- src/proto_017_PtNairob/lib_protocol/test/unit/dune | 3 ++- src/proto_017_PtNairob/lib_sc_rollup_node/test/dune | 3 ++- src/proto_alpha/lib_client/test/dune | 3 ++- src/proto_alpha/lib_dac_plugin/test/dune | 3 ++- src/proto_alpha/lib_dal/test/dune | 3 ++- src/proto_alpha/lib_delegate/test/dune | 3 ++- src/proto_alpha/lib_plugin/test/dune | 3 ++- .../lib_protocol/test/integration/consensus/dune | 3 ++- src/proto_alpha/lib_protocol/test/integration/dune | 3 ++- src/proto_alpha/lib_protocol/test/integration/gas/dune | 3 ++- .../lib_protocol/test/integration/michelson/dune | 3 ++- .../lib_protocol/test/integration/operations/dune | 3 ++- .../lib_protocol/test/integration/validate/dune | 3 ++- src/proto_alpha/lib_protocol/test/pbt/dune | 3 ++- src/proto_alpha/lib_protocol/test/regression/dune | 3 ++- src/proto_alpha/lib_protocol/test/unit/dune | 3 ++- src/proto_alpha/lib_sc_rollup_node/test/dune | 3 ++- tezt/self_tests/dune | 6 +++++- 141 files changed, 232 insertions(+), 149 deletions(-) diff --git a/opam/octez-bls12-381-polynomial.opam b/opam/octez-bls12-381-polynomial.opam index 2ef284e3f9ee..0130813c0668 100644 --- a/opam/octez-bls12-381-polynomial.opam +++ b/opam/octez-bls12-381-polynomial.opam @@ -23,6 +23,5 @@ 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: "Polynomials over BLS12-381 finite field - Temporary vendored version of Octez" diff --git a/opam/octez-polynomial.opam b/opam/octez-polynomial.opam index e2a19e799ea8..31e463c35d71 100644 --- a/opam/octez-polynomial.opam +++ b/opam/octez-polynomial.opam @@ -21,6 +21,5 @@ 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: "Polynomials over finite fields" diff --git a/opam/tezos-baking-016-PtMumbai.opam b/opam/tezos-baking-016-PtMumbai.opam index 13edf2584578..8baedc8cd012 100644 --- a/opam/tezos-baking-016-PtMumbai.opam +++ b/opam/tezos-baking-016-PtMumbai.opam @@ -46,6 +46,5 @@ 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/Protocol: base library for `tezos-baker/accuser`" diff --git a/opam/tezos-baking-017-PtNairob.opam b/opam/tezos-baking-017-PtNairob.opam index 131b95b09d27..b31a406e50e7 100644 --- a/opam/tezos-baking-017-PtNairob.opam +++ b/opam/tezos-baking-017-PtNairob.opam @@ -47,6 +47,5 @@ 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/Protocol: base library for `tezos-baker/accuser`" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 208f5a1f6a7c..baa7a5e40733 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -47,6 +47,5 @@ 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/Protocol: base library for `tezos-baker/accuser`" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index 11bc5d5371e4..475b3c29655d 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -33,6 +33,5 @@ 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: meta-package and pervasive type definitions for Tezos" diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index 068c5e5a13ab..5791b3cecc63 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -23,6 +23,5 @@ 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: tests for lib-benchmarks" diff --git a/opam/tezos-clic.opam b/opam/tezos-clic.opam index 97673e8c15f1..fb8da3b0ed05 100644 --- a/opam/tezos-clic.opam +++ b/opam/tezos-clic.opam @@ -23,6 +23,5 @@ 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/opam/tezos-client-016-PtMumbai.opam b/opam/tezos-client-016-PtMumbai.opam index da8eb2579684..bcdc209fa226 100644 --- a/opam/tezos-client-016-PtMumbai.opam +++ b/opam/tezos-client-016-PtMumbai.opam @@ -41,6 +41,5 @@ 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/Protocol: protocol specific library for `tezos-client`" diff --git a/opam/tezos-client-017-PtNairob.opam b/opam/tezos-client-017-PtNairob.opam index 8f535f3adb7a..3005825c56f3 100644 --- a/opam/tezos-client-017-PtNairob.opam +++ b/opam/tezos-client-017-PtNairob.opam @@ -41,6 +41,5 @@ 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/Protocol: protocol specific library for `tezos-client`" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 952f469ce90f..547eb8b66614 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -41,6 +41,5 @@ 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/Protocol: protocol specific library for `tezos-client`" diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 2be528812529..891d347e6c63 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -34,6 +34,5 @@ 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` (unix-specific fragment)" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index 0d47055b3b5c..3c5da340b064 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -23,6 +23,5 @@ 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/opam/tezos-context.opam b/opam/tezos-context.opam index 6bdbf4b6762d..4e2ab17a0a24 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -30,6 +30,5 @@ 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: on-disk context abstraction for `octez-node`" diff --git a/opam/tezos-crypto-dal.opam b/opam/tezos-crypto-dal.opam index b4d4565ee8e1..8f60a186c26d 100644 --- a/opam/tezos-crypto-dal.opam +++ b/opam/tezos-crypto-dal.opam @@ -25,6 +25,5 @@ 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: "DAL cryptographic primitives" diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index 63e228f31d62..b18acc7cbb9e 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -32,6 +32,5 @@ 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 with all the cryptographic primitives used by Tezos" diff --git a/opam/tezos-dac-017-PtNairob.opam b/opam/tezos-dac-017-PtNairob.opam index 1c6fd1dc4a21..faac988bb31e 100644 --- a/opam/tezos-dac-017-PtNairob.opam +++ b/opam/tezos-dac-017-PtNairob.opam @@ -29,6 +29,5 @@ 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/Protocol: protocol specific library for the Data availability Committee" diff --git a/opam/tezos-dac-alpha.opam b/opam/tezos-dac-alpha.opam index c9455e166f1b..5881dfe29b6f 100644 --- a/opam/tezos-dac-alpha.opam +++ b/opam/tezos-dac-alpha.opam @@ -29,6 +29,5 @@ 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/Protocol: protocol specific library for the Data availability Committee" diff --git a/opam/tezos-dac-node-lib-test.opam b/opam/tezos-dac-node-lib-test.opam index 655542591eb5..71e5c5b068db 100644 --- a/opam/tezos-dac-node-lib-test.opam +++ b/opam/tezos-dac-node-lib-test.opam @@ -23,6 +23,5 @@ 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: "Test for dac node lib" diff --git a/opam/tezos-dal-016-PtMumbai.opam b/opam/tezos-dal-016-PtMumbai.opam index 605da522474b..595346daf66a 100644 --- a/opam/tezos-dal-016-PtMumbai.opam +++ b/opam/tezos-dal-016-PtMumbai.opam @@ -29,6 +29,5 @@ 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/Protocol: protocol specific library for the Data availability Layer" diff --git a/opam/tezos-dal-017-PtNairob.opam b/opam/tezos-dal-017-PtNairob.opam index 16046a2bfa47..a70f0de5fb13 100644 --- a/opam/tezos-dal-017-PtNairob.opam +++ b/opam/tezos-dal-017-PtNairob.opam @@ -29,6 +29,5 @@ 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/Protocol: protocol specific library for the Data availability Layer" diff --git a/opam/tezos-dal-alpha.opam b/opam/tezos-dal-alpha.opam index d1f462a1a2ff..1e7785e7fc03 100644 --- a/opam/tezos-dal-alpha.opam +++ b/opam/tezos-dal-alpha.opam @@ -29,6 +29,5 @@ 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/Protocol: protocol specific library for the Data availability Layer" diff --git a/opam/tezos-error-monad.opam b/opam/tezos-error-monad.opam index 6f31fd2ec824..bd2d13e4c11e 100644 --- a/opam/tezos-error-monad.opam +++ b/opam/tezos-error-monad.opam @@ -25,6 +25,5 @@ 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/opam/tezos-hacl.opam b/opam/tezos-hacl.opam index 8696b7582c7a..365093465943 100644 --- a/opam/tezos-hacl.opam +++ b/opam/tezos-hacl.opam @@ -33,6 +33,5 @@ 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: thin layer around hacl-star" diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index 8fc4e2162860..d1f880b5386a 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -29,6 +29,5 @@ 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: layer2 storage utils" diff --git a/opam/tezos-lazy-containers-tests.opam b/opam/tezos-lazy-containers-tests.opam index 3013dd304e5d..eb2f132ea37b 100644 --- a/opam/tezos-lazy-containers-tests.opam +++ b/opam/tezos-lazy-containers-tests.opam @@ -21,6 +21,5 @@ 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: "Various tests for the lazy containers library" diff --git a/opam/tezos-lwt-result-stdlib.opam b/opam/tezos-lwt-result-stdlib.opam index 4407cba3664c..c4cbaa485b1c 100644 --- a/opam/tezos-lwt-result-stdlib.opam +++ b/opam/tezos-lwt-result-stdlib.opam @@ -21,6 +21,5 @@ build: [ ["rm" "-r" "vendors"] ["dune" "build" "-p" name "-j" jobs] ["dune" "runtest" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" } - ["dune" "build" "@runtezt" "-p" name "-j" jobs] { with-test & arch != "arm32" & arch != "x86_32" } ] synopsis: "Tezos: error-aware stdlib replacement" diff --git a/opam/tezos-micheline-rewriting.opam b/opam/tezos-micheline-rewriting.opam index a7640e10850d..0fc2f0f9d3d3 100644 --- a/opam/tezos-micheline-rewriting.opam +++ b/opam/tezos-micheline-rewriting.opam @@ -24,6 +24,5 @@ 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 for rewriting Micheline expressions" diff --git a/opam/tezos-mockup.opam b/opam/tezos-mockup.opam index cd344f16d2e9..aafa484a0df4 100644 --- a/opam/tezos-mockup.opam +++ b/opam/tezos-mockup.opam @@ -32,6 +32,5 @@ 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 RPCs (mockup mode)" diff --git a/opam/tezos-p2p.opam b/opam/tezos-p2p.opam index 3eee0862e8b7..636d526a8b9a 100644 --- a/opam/tezos-p2p.opam +++ b/opam/tezos-p2p.opam @@ -32,6 +32,5 @@ 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 for a pool of P2P connections" diff --git a/opam/tezos-protocol-016-PtMumbai-tests.opam b/opam/tezos-protocol-016-PtMumbai-tests.opam index 3758ea31f2d1..51e055e80dfe 100644 --- a/opam/tezos-protocol-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-016-PtMumbai-tests.opam @@ -40,6 +40,5 @@ 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/Protocol: tests for economic-protocol definition" diff --git a/opam/tezos-protocol-017-PtNairob-tests.opam b/opam/tezos-protocol-017-PtNairob-tests.opam index 76e17a834c18..24e6dc306f53 100644 --- a/opam/tezos-protocol-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-017-PtNairob-tests.opam @@ -40,6 +40,5 @@ 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/Protocol: tests for economic-protocol definition" diff --git a/opam/tezos-protocol-alpha-tests.opam b/opam/tezos-protocol-alpha-tests.opam index 2284a347bcd0..187c709e7090 100644 --- a/opam/tezos-protocol-alpha-tests.opam +++ b/opam/tezos-protocol-alpha-tests.opam @@ -40,6 +40,5 @@ 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/Protocol: tests for economic-protocol definition" diff --git a/opam/tezos-protocol-environment.opam b/opam/tezos-protocol-environment.opam index 7f3a76a9c833..311f64d40928 100644 --- a/opam/tezos-protocol-environment.opam +++ b/opam/tezos-protocol-environment.opam @@ -38,7 +38,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: "Interface layer between the protocols and the shell" description: "The protocol-environment is a two-sided component sitting between the shell and diff --git a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam index 0c9924353ce5..08253de819e1 100644 --- a/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam +++ b/opam/tezos-protocol-plugin-016-PtMumbai-tests.opam @@ -26,6 +26,5 @@ 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/Protocol: protocol plugin tests" diff --git a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam index a03593558319..3422ca9a0473 100644 --- a/opam/tezos-protocol-plugin-017-PtNairob-tests.opam +++ b/opam/tezos-protocol-plugin-017-PtNairob-tests.opam @@ -26,6 +26,5 @@ 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/Protocol: protocol plugin tests" diff --git a/opam/tezos-protocol-plugin-alpha-tests.opam b/opam/tezos-protocol-plugin-alpha-tests.opam index 3e3328172204..b63b2cc5e8fc 100644 --- a/opam/tezos-protocol-plugin-alpha-tests.opam +++ b/opam/tezos-protocol-plugin-alpha-tests.opam @@ -26,6 +26,5 @@ 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/Protocol: protocol plugin tests" diff --git a/opam/tezos-proxy-server-config.opam b/opam/tezos-proxy-server-config.opam index c795f6e3c9f0..632a24230157 100644 --- a/opam/tezos-proxy-server-config.opam +++ b/opam/tezos-proxy-server-config.opam @@ -22,6 +22,5 @@ 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: proxy server configuration" diff --git a/opam/tezos-proxy.opam b/opam/tezos-proxy.opam index 8e616003d7b5..339d6550ff7a 100644 --- a/opam/tezos-proxy.opam +++ b/opam/tezos-proxy.opam @@ -34,6 +34,5 @@ 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: proxy" diff --git a/opam/tezos-requester.opam b/opam/tezos-requester.opam index f390ba8d1108..93411c7ac107 100644 --- a/opam/tezos-requester.opam +++ b/opam/tezos-requester.opam @@ -24,6 +24,5 @@ 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: generic resource fetching service" diff --git a/opam/tezos-rpc-http-server.opam b/opam/tezos-rpc-http-server.opam index 5d2931677927..9a08bf0f2a28 100644 --- a/opam/tezos-rpc-http-server.opam +++ b/opam/tezos-rpc-http-server.opam @@ -27,6 +27,5 @@ 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 RPCs (http server)" diff --git a/opam/tezos-sc-rollup-node-test.opam b/opam/tezos-sc-rollup-node-test.opam index 6f807ae0ba75..36772d19d9c4 100644 --- a/opam/tezos-sc-rollup-node-test.opam +++ b/opam/tezos-sc-rollup-node-test.opam @@ -34,6 +34,5 @@ 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: "Tests for the smart rollup node library" diff --git a/opam/tezos-shell-context-test.opam b/opam/tezos-shell-context-test.opam index c5075c83ae15..176b296bf6f1 100644 --- a/opam/tezos-shell-context-test.opam +++ b/opam/tezos-shell-context-test.opam @@ -21,6 +21,5 @@ 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: "Testing the Shell Context" diff --git a/opam/tezos-shell-services.opam b/opam/tezos-shell-services.opam index cbb7134383e9..2ac6b9093867 100644 --- a/opam/tezos-shell-services.opam +++ b/opam/tezos-shell-services.opam @@ -22,6 +22,5 @@ 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: descriptions of RPCs exported by `tezos-shell`" diff --git a/opam/tezos-shell.opam b/opam/tezos-shell.opam index f0cadc09966c..3d72479b0808 100644 --- a/opam/tezos-shell.opam +++ b/opam/tezos-shell.opam @@ -42,6 +42,5 @@ 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: core of `octez-node` (gossip, validation scheduling, mempool, ...)" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 163307e11a7b..5944f94b4f37 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -38,6 +38,5 @@ 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: remote-signature backends for `tezos-client`" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index 1a90160f0045..e461e1e6604a 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -35,6 +35,5 @@ 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: yet-another local-extension of the OCaml standard library (unix-specific fragment)" diff --git a/opam/tezos-stdlib.opam b/opam/tezos-stdlib.opam index ca8bdb8b22cb..3183c9a298c3 100644 --- a/opam/tezos-stdlib.opam +++ b/opam/tezos-stdlib.opam @@ -27,6 +27,5 @@ 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: yet-another local-extension of the OCaml standard library" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 48006b8c751c..3c344f395137 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -48,7 +48,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: store for `octez-node`" description: "This library provides abstraction for storing and iterating over blocks. diff --git a/opam/tezos-tree-encoding-test.opam b/opam/tezos-tree-encoding-test.opam index 928c1bc74fac..e17249b597d9 100644 --- a/opam/tezos-tree-encoding-test.opam +++ b/opam/tezos-tree-encoding-test.opam @@ -24,6 +24,5 @@ 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: "Tests for the tree encoding library" diff --git a/opam/tezos-version.opam b/opam/tezos-version.opam index 38f2358a7b7d..0e3e8768f909 100644 --- a/opam/tezos-version.opam +++ b/opam/tezos-version.opam @@ -20,6 +20,5 @@ 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/opam/tezos-webassembly-interpreter.opam b/opam/tezos-webassembly-interpreter.opam index 491d3c7137f5..85e0d0068ab1 100644 --- a/opam/tezos-webassembly-interpreter.opam +++ b/opam/tezos-webassembly-interpreter.opam @@ -23,6 +23,5 @@ 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: "WebAssembly reference interpreter with tweaks for Tezos" diff --git a/opam/tezos-workers.opam b/opam/tezos-workers.opam index 69c0dbd304a0..77bf229a2615 100644 --- a/opam/tezos-workers.opam +++ b/opam/tezos-workers.opam @@ -22,6 +22,5 @@ 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: worker library" diff --git a/opam/tezt-tezos.opam b/opam/tezt-tezos.opam index d3c4bb2ea9f0..ff74f320683e 100644 --- a/opam/tezt-tezos.opam +++ b/opam/tezt-tezos.opam @@ -22,6 +22,5 @@ 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 test framework based on Tezt" diff --git a/src/lib_base/test/dune b/src/lib_base/test/dune index 0f40e994fadd..a65372282770 100644 --- a/src/lib_base/test/dune +++ b/src/lib_base/test/dune @@ -36,9 +36,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-base) (deps points.ok points.ko) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule @@ -56,9 +57,10 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-base) (deps points.ok points.ko) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_base/unix/test/dune b/src/lib_base/unix/test/dune index dbee3d665c98..9cdabb82a3de 100644 --- a/src/lib_base/unix/test/dune +++ b/src/lib_base/unix/test/dune @@ -40,7 +40,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-base) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-base) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index d508c8c45fa5..c43985e60b77 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -31,8 +31,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-micheline-rewriting) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index 733e5e123934..875833bc633b 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-benchmark-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_bls12_381_polynomial/test/dune b/src/lib_bls12_381_polynomial/test/dune index 3e87d31f6337..c7c14563d946 100644 --- a/src/lib_bls12_381_polynomial/test/dune +++ b/src/lib_bls12_381_polynomial/test/dune @@ -36,9 +36,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package octez-bls12-381-polynomial) (deps srs_zcash_g1_5) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_clic/test/dune b/src/lib_clic/test/dune index 1aa9985d0d03..5a051779be4a 100644 --- a/src/lib_clic/test/dune +++ b/src/lib_clic/test/dune @@ -28,7 +28,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-clic) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-clic) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index 07e58f67869e..aea92b18dfad 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -34,8 +34,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-client-base) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule @@ -56,8 +57,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-client-base) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 68cac4682067..e63f5950d11a 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -33,8 +33,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-client-base-unix) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_context/memory/test/dune b/src/lib_context/memory/test/dune index 08931b6a9985..12bf98271b44 100644 --- a/src/lib_context/memory/test/dune +++ b/src/lib_context/memory/test/dune @@ -31,8 +31,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-context) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_context/test/dune b/src/lib_context/test/dune index 5cd9113d2e64..83f86e96779b 100644 --- a/src/lib_context/test/dune +++ b/src/lib_context/test/dune @@ -36,8 +36,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-context) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_crypto/test-unix/dune b/src/lib_crypto/test-unix/dune index 34eccc1516bb..32ce59d22e7d 100644 --- a/src/lib_crypto/test-unix/dune +++ b/src/lib_crypto/test-unix/dune @@ -38,7 +38,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-crypto) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-crypto) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_crypto/test/dune b/src/lib_crypto/test/dune index d27d762c3caf..f748e4468f78 100644 --- a/src/lib_crypto/test/dune +++ b/src/lib_crypto/test/dune @@ -55,7 +55,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-crypto) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-crypto) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) @@ -72,8 +76,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-crypto) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_crypto_dal/test/dune b/src/lib_crypto_dal/test/dune index 63b7f9f58f2a..7b464a11c459 100644 --- a/src/lib_crypto_dal/test/dune +++ b/src/lib_crypto_dal/test/dune @@ -35,9 +35,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-crypto-dal) (deps srs_zcash_g1_5 srs_zcash_g2_5) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index 875801c6fd7f..0fe664acf021 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -40,8 +40,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dac-node-lib-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 3b641a780844..0f7955f6cd01 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -32,8 +32,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-error-monad) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule @@ -54,8 +55,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-error-monad) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_hacl/test/dune b/src/lib_hacl/test/dune index 091b6e7afac9..dc75e64c5142 100644 --- a/src/lib_hacl/test/dune +++ b/src/lib_hacl/test/dune @@ -48,7 +48,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-hacl) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-hacl) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) @@ -65,8 +69,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-hacl) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_layer2_store/test/dune b/src/lib_layer2_store/test/dune index 0703c5910ca7..75ce8b120378 100644 --- a/src/lib_layer2_store/test/dune +++ b/src/lib_layer2_store/test/dune @@ -30,8 +30,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-layer2-store) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_lazy_containers/test/dune b/src/lib_lazy_containers/test/dune index 3d5fe425bc12..921bf1162921 100644 --- a/src/lib_lazy_containers/test/dune +++ b/src/lib_lazy_containers/test/dune @@ -29,8 +29,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-lazy-containers-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_lwt_result_stdlib/test/dune b/src/lib_lwt_result_stdlib/test/dune index 50ef616de6a3..3ecf4d8d1376 100644 --- a/src/lib_lwt_result_stdlib/test/dune +++ b/src/lib_lwt_result_stdlib/test/dune @@ -42,8 +42,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-lwt-result-stdlib) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index f62ff0a1581b..05ff497bc757 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -37,7 +37,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-mockup) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-mockup) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_p2p/tezt/dune b/src/lib_p2p/tezt/dune index ee31591ca3b7..09c78a2457c4 100644 --- a/src/lib_p2p/tezt/dune +++ b/src/lib_p2p/tezt/dune @@ -40,7 +40,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-p2p) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-p2p) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_polynomial/test/dune b/src/lib_polynomial/test/dune index 69da6cb80949..9a9b01644167 100644 --- a/src/lib_polynomial/test/dune +++ b/src/lib_polynomial/test/dune @@ -27,8 +27,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package octez-polynomial) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_protocol_environment/test/dune b/src/lib_protocol_environment/test/dune index 5f3fcabf7f46..efdddcba9af5 100644 --- a/src/lib_protocol_environment/test/dune +++ b/src/lib_protocol_environment/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-environment) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_protocol_environment/test_shell_context/dune b/src/lib_protocol_environment/test_shell_context/dune index 1455fd5fc832..1d652f463f13 100644 --- a/src/lib_protocol_environment/test_shell_context/dune +++ b/src/lib_protocol_environment/test_shell_context/dune @@ -31,8 +31,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-shell-context-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 6affb1c9baba..c958c42d044a 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -43,7 +43,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-proxy) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-proxy) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_proxy/test_helpers/shell_services/test/dune b/src/lib_proxy/test_helpers/shell_services/test/dune index f9f357d68e4d..93ed4a083bdc 100644 --- a/src/lib_proxy/test_helpers/shell_services/test/dune +++ b/src/lib_proxy/test_helpers/shell_services/test/dune @@ -31,7 +31,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-proxy) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-proxy) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_proxy_server_config/test/dune b/src/lib_proxy_server_config/test/dune index f330d1754a69..11d6979570d6 100644 --- a/src/lib_proxy_server_config/test/dune +++ b/src/lib_proxy_server_config/test/dune @@ -32,8 +32,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-proxy-server-config) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_requester/test/dune b/src/lib_requester/test/dune index 2fb0e8b5e238..79cc6b8fb7a9 100644 --- a/src/lib_requester/test/dune +++ b/src/lib_requester/test/dune @@ -37,8 +37,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-requester) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_rpc_http/test/dune b/src/lib_rpc_http/test/dune index 296298decb9c..a01a9618a9da 100644 --- a/src/lib_rpc_http/test/dune +++ b/src/lib_rpc_http/test/dune @@ -37,8 +37,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-rpc-http-server) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index f4bbc29bdb52..c957cee7aa17 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -66,9 +66,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-sapling) (deps vectors.csv vectors-zip32.csv) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 5c22cfd320bd..11f1b9be1d3e 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -75,7 +75,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-shell) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-shell) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_shell_services/test/dune b/src/lib_shell_services/test/dune index 2ac9f78dfa41..1d113c8ccaf1 100644 --- a/src/lib_shell_services/test/dune +++ b/src/lib_shell_services/test/dune @@ -32,8 +32,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-shell-services) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule @@ -51,8 +52,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-shell-services) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index b1d0143323cd..1d40c19677fd 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -40,8 +40,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-signer-backends) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index e505661e723d..1a33187268e0 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -36,8 +36,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-signer-backends) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_stdlib/test-unix/dune b/src/lib_stdlib/test-unix/dune index 684f533dcde6..4f0bab8565e8 100644 --- a/src/lib_stdlib/test-unix/dune +++ b/src/lib_stdlib/test-unix/dune @@ -35,7 +35,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezos-stdlib) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-stdlib) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index 66ef90624819..34fe63118a5b 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -43,7 +43,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-stdlib) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-stdlib) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) @@ -63,8 +67,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-stdlib) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_stdlib_unix/test/dune b/src/lib_stdlib_unix/test/dune index 3317f80193c7..c9962d450507 100644 --- a/src/lib_stdlib_unix/test/dune +++ b/src/lib_stdlib_unix/test/dune @@ -34,8 +34,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-stdlib-unix) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index 98d0d1ee061b..b63f42b36301 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -71,7 +71,11 @@ (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) -(rule (alias runtezt) (package tezos-store) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezos-store) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) diff --git a/src/lib_tree_encoding/test/dune b/src/lib_tree_encoding/test/dune index abd279788ad3..0dd01eea8d5b 100644 --- a/src/lib_tree_encoding/test/dune +++ b/src/lib_tree_encoding/test/dune @@ -35,8 +35,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-tree-encoding-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_version/test/dune b/src/lib_version/test/dune index 2c9893c54529..2185770405c2 100644 --- a/src/lib_version/test/dune +++ b/src/lib_version/test/dune @@ -31,8 +31,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-version) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule @@ -50,8 +51,9 @@ (modules main_js)) (rule - (alias runtezt_js) + (alias runtest_js) (package tezos-version) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run node %{dep:./main_js.bc.js}))) (rule diff --git a/src/lib_webassembly/tests/dune b/src/lib_webassembly/tests/dune index 03c80033c380..6ff5f874aa5e 100644 --- a/src/lib_webassembly/tests/dune +++ b/src/lib_webassembly/tests/dune @@ -28,8 +28,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-webassembly-interpreter) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/lib_workers/test/dune b/src/lib_workers/test/dune index b89f0374a186..64584244fc38 100644 --- a/src/lib_workers/test/dune +++ b/src/lib_workers/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-workers) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_client/test/dune b/src/proto_016_PtMumbai/lib_client/test/dune index ea3c3dd4ad93..da1578e9a460 100644 --- a/src/proto_016_PtMumbai/lib_client/test/dune +++ b/src/proto_016_PtMumbai/lib_client/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-client-016-PtMumbai) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_dal/test/dune b/src/proto_016_PtMumbai/lib_dal/test/dune index 858baf037ba0..04fbc73bef7a 100644 --- a/src/proto_016_PtMumbai/lib_dal/test/dune +++ b/src/proto_016_PtMumbai/lib_dal/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dal-016-PtMumbai) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_delegate/test/dune b/src/proto_016_PtMumbai/lib_delegate/test/dune index 8206c345908c..4e586a4f4f7f 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-baking-016-PtMumbai) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_plugin/test/dune b/src/proto_016_PtMumbai/lib_plugin/test/dune index 70d7d736ad7c..1ca373c52a4b 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/dune +++ b/src/proto_016_PtMumbai/lib_plugin/test/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-plugin-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune index 4a436a53b8d4..624622ff4987 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune @@ -55,8 +55,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune index 182c5ac90be7..edec5df63cd7 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune @@ -48,9 +48,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) (deps (glob_files wasm_kernel/*.wasm)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune index 9ad3d27331b8..339899a8aa6e 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune @@ -36,8 +36,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune index c3545cbe1310..a86fb297c34e 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune @@ -70,12 +70,13 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) (deps (glob_files contracts/*) (glob_files patched_contracts/*) (glob_files_rec ../../../../../../michelson_test_scripts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune index b42195537278..197400d5fc73 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune @@ -54,9 +54,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) (deps (glob_files contracts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune index c4da91d164aa..8a40ed68eabf 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune index aa2b2f7f667e..7561df4c3718 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune @@ -72,8 +72,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune index e795506d0365..837d431da709 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune @@ -39,11 +39,12 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) (deps (glob_files contracts/*.tz) (glob_files expected/test_logging.ml/*.out)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune index ff995683c840..f9e9b57cf855 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune @@ -87,8 +87,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-016-PtMumbai-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune index a8cd5803af88..cfd8230f6ff9 100644 --- a/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune +++ b/src/proto_016_PtMumbai/lib_sc_rollup_node/test/dune @@ -40,8 +40,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-sc-rollup-node-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_client/test/dune b/src/proto_017_PtNairob/lib_client/test/dune index 8fe17a865dfb..efa3f000762d 100644 --- a/src/proto_017_PtNairob/lib_client/test/dune +++ b/src/proto_017_PtNairob/lib_client/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-client-017-PtNairob) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_dac_plugin/test/dune b/src/proto_017_PtNairob/lib_dac_plugin/test/dune index 281a3a4a6a60..5e2225979b01 100644 --- a/src/proto_017_PtNairob/lib_dac_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_dac_plugin/test/dune @@ -42,8 +42,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dac-017-PtNairob) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_dal/test/dune b/src/proto_017_PtNairob/lib_dal/test/dune index 93b86554a027..804512704ae3 100644 --- a/src/proto_017_PtNairob/lib_dal/test/dune +++ b/src/proto_017_PtNairob/lib_dal/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dal-017-PtNairob) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_delegate/test/dune b/src/proto_017_PtNairob/lib_delegate/test/dune index 33a473dda4ed..15f28f6fa37a 100644 --- a/src/proto_017_PtNairob/lib_delegate/test/dune +++ b/src/proto_017_PtNairob/lib_delegate/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-baking-017-PtNairob) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_plugin/test/dune b/src/proto_017_PtNairob/lib_plugin/test/dune index b6870095abf3..53ad3cdfaa87 100644 --- a/src/proto_017_PtNairob/lib_plugin/test/dune +++ b/src/proto_017_PtNairob/lib_plugin/test/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-plugin-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune index 1b9883735dd8..dcc030dd8cb3 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/consensus/dune @@ -55,8 +55,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/dune index b693985a9757..c1924d1328de 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/dune @@ -48,9 +48,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) (deps (glob_files wasm_kernel/*.wasm)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune index f672359723a1..b020e8428bb0 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/gas/dune @@ -36,8 +36,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune index 591d17699012..6479a398b7d2 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/michelson/dune @@ -70,12 +70,13 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) (deps (glob_files contracts/*) (glob_files patched_contracts/*) (glob_files_rec ../../../../../../michelson_test_scripts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune index 1fb2146fd6a0..82399d4d0cc8 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/operations/dune @@ -53,9 +53,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) (deps (glob_files contracts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune index 7583e561a113..c7ae88786777 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/integration/validate/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune index bcada9c56f93..5cae4856cbe5 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/pbt/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/pbt/dune @@ -72,8 +72,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/regression/dune b/src/proto_017_PtNairob/lib_protocol/test/regression/dune index fb784bb650fe..1bbb272eec4c 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/regression/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/regression/dune @@ -39,11 +39,12 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) (deps (glob_files contracts/*.tz) (glob_files expected/test_logging.ml/*.out)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_protocol/test/unit/dune b/src/proto_017_PtNairob/lib_protocol/test/unit/dune index b509ba76ebf6..9f88b1fd4e58 100644 --- a/src/proto_017_PtNairob/lib_protocol/test/unit/dune +++ b/src/proto_017_PtNairob/lib_protocol/test/unit/dune @@ -85,8 +85,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-017-PtNairob-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune index 0c4be912fd2e..aaf6eedbeb44 100644 --- a/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune +++ b/src/proto_017_PtNairob/lib_sc_rollup_node/test/dune @@ -40,8 +40,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-sc-rollup-node-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index 6a37a175607d..1dcf450e5e58 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-client-alpha) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_dac_plugin/test/dune b/src/proto_alpha/lib_dac_plugin/test/dune index 3b4e454d6e25..3f91199cb100 100644 --- a/src/proto_alpha/lib_dac_plugin/test/dune +++ b/src/proto_alpha/lib_dac_plugin/test/dune @@ -42,8 +42,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dac-alpha) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune index 2ba69866c9a5..556c1d298977 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -38,8 +38,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-dal-alpha) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index 706b888e7f2f..95048d5ea590 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -45,8 +45,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-baking-alpha) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index 5cdafd3624a4..1d8398ee0a44 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-plugin-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index 92fe3e3fbd1a..25d49561579f 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index ce2cc809c2d4..3354358ec99d 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -48,9 +48,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) (deps (glob_files wasm_kernel/*.wasm)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune index 0dec55471c64..0614024c0f11 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -36,8 +36,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index 2d1bdf43125d..b2b7e98360c0 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -69,12 +69,13 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) (deps (glob_files contracts/*) (glob_files patched_contracts/*) (glob_files_rec ../../../../../../michelson_test_scripts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index e5271ad452ed..75169b562aff 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -52,9 +52,10 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) (deps (glob_files contracts/*)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 5aa689d327af..318c86e9b56b 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -54,8 +54,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index cf9aa4066635..2de7189dbcf1 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -72,8 +72,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 2fd1dde8bad6..63bf7c2bd15d 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -39,11 +39,12 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) (deps (glob_files contracts/*.tz) (glob_files expected/test_logging.ml/*.out)) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index ef1598ffb81c..75d1f001ab4b 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -85,8 +85,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-protocol-alpha-tests) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/src/proto_alpha/lib_sc_rollup_node/test/dune b/src/proto_alpha/lib_sc_rollup_node/test/dune index c1ab36f7bf65..cced4a548dce 100644 --- a/src/proto_alpha/lib_sc_rollup_node/test/dune +++ b/src/proto_alpha/lib_sc_rollup_node/test/dune @@ -40,8 +40,9 @@ (modules main)) (rule - (alias runtezt) + (alias runtest) (package tezos-sc-rollup-node-test) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) (action (run %{dep:./main.exe}))) (rule diff --git a/tezt/self_tests/dune b/tezt/self_tests/dune index b597472dd9fc..d8dba2f9aecc 100644 --- a/tezt/self_tests/dune +++ b/tezt/self_tests/dune @@ -26,7 +26,11 @@ tezt) (modules main)) -(rule (alias runtezt) (package tezt-tezos) (action (run %{dep:./main.exe}))) +(rule + (alias runtest) + (package tezt-tezos) + (enabled_if (<> false %{env:RUNTEZTALIAS=true})) + (action (run %{dep:./main.exe}))) (rule (targets main.ml) -- GitLab From 6a20fc07ae25e77d6605feeb740b933177c19562 Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Wed, 26 Apr 2023 08:15:31 +0200 Subject: [PATCH 5/7] CI: deactivate Tezts in unit jobs but run them in opam jobs --- .gitlab-ci.yml | 6 ++++++ .gitlab/ci/jobs/packaging/opam_prepare.yml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61e23dbbc905..2d39666b6510 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,12 @@ variables: # this setting cuts cache creation time. FF_USE_FASTZIP: "true" + # If RUNTEZTALIAS is true, then Tezt tests are included in the @runtest + # alias. We set it to false to deactivate these tests in the unit + # test jobs, as they already run in the Tezt jobs. It is set to true + # in the opam jobs where we want to run the tests --with-test. + RUNTEZTALIAS: "false" + # Image templates .image_template__runtime_build_e2etest_dependencies_template: image: ${build_deps_image_name}:runtime-build-e2etest-dependencies--${build_deps_image_version} diff --git a/.gitlab/ci/jobs/packaging/opam_prepare.yml b/.gitlab/ci/jobs/packaging/opam_prepare.yml index 1313e4a4d272..62d69117eb85 100644 --- a/.gitlab/ci/jobs/packaging/opam_prepare.yml +++ b/.gitlab/ci/jobs/packaging/opam_prepare.yml @@ -23,6 +23,8 @@ - opam_logs/ expire_in: 1 week when: always + variables: + RUNTEZTALIAS: "true" opam:prepare: extends: -- GitLab From 19d063f655eea758927a20ea5f0b78936ea63cef Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 20 Apr 2023 12:28:27 +0200 Subject: [PATCH 6/7] Makefile: Do not run [runtezt_js] in [test-js] The alias is [runtezt_js] now included in [runtest_js]. --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f838b26687c5..e1b700fed418 100644 --- a/Makefile +++ b/Makefile @@ -273,19 +273,10 @@ test-unit-alpha: @dune build --profile=$(PROFILE) @src/proto_alpha/lib_protocol/runtest # TODO: https://gitlab.com/tezos/tezos/-/issues/5377 -# Running the runtest/runtezt targets in parallel causes a hang. Until we find the cause, -# we run the targets sequentially. +# Running the runtest_js targets intermittently hangs. .PHONY: test-js test-js: @dune build --error-reporting=twice @runtest_js - @dune build --error-reporting=twice @runtezt_js - -# separate job to use tezt with js. Eventually should be merged with -# the job about (test-js) . For the moment this is not run in the CI -# TODO: https://gitlab.com/tezos/tezos/-/issues/5377 -.PHONY: tezt-js -tezt-js: - @dune build --error-reporting=twice @runtezt_js .PHONY: build-tezt build-tezt: -- GitLab From 5a436d5c13d6d545a43d9f817f56b0f5c24edb1d Mon Sep 17 00:00:00 2001 From: Arvid Jakobsson Date: Thu, 20 Apr 2023 12:09:30 +0200 Subject: [PATCH 7/7] Docs: Replace mentions of [runtezt] with [runtest] Also remove the explanation of the [runtezt] alias in [alcotezt.rst]. Also add an explanation of the [RUNTEZTALIAS] environment variable. --- docs/developer/alcotezt.rst | 50 ++++++++++++++++++------------------- docs/developer/testing.rst | 4 +-- docs/developer/tezt.rst | 4 +-- manifest/main.ml | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/developer/alcotezt.rst b/docs/developer/alcotezt.rst index c6f89c96942e..0aadfd5be34f 100644 --- a/docs/developer/alcotezt.rst +++ b/docs/developer/alcotezt.rst @@ -13,12 +13,10 @@ function. This will: - Create a *test library* that registers the tests in the modules given as argument to ``tezt``. - - Create a *runner executable* ``main.exe`` in the test folder. The - runner links with the test library and consists of a single call to + - Create a *test executable* ``main.exe`` in the test folder. The + test executable links with the test library and consists of a single call to Tezt's `Test.run `__. - - Add a ``runtezt`` alias in the Dune file of the test target that - executes the runner. - Finally, link the test library with Tezt's main entrypoint at ``tezt/tests/main.exe`` so that it registers all Alcotezts. @@ -33,15 +31,15 @@ For a given folder ``$TEST_DIR``, the Alcotezts contained therein can be invoked Manifest. Through ``dune``, this is done with ``dune exec $TEST_DIR/main.exe``. This will execute the tests in ``$TEST_DIR`` (but not in its subdirectories). - 2. Through Dune, by building the ``runtezt`` alias in the test target - folder. That is, executing ``dune build @$TEST_DIR/runtezt``. + 2. Through Dune, by building the ``runtest`` alias in the test target + folder. That is, executing ``dune build @$TEST_DIR/runtest``. This will execute the tests in ``$TEST_DIR`` and its subdirectories. 3. By executing the full Tezt test suite, via the main entrypoint at ``tezt/tests/main.exe``. Through Dune, this is done with ``dune exec tezt/tests/main.exe``. -Execution through the ``main.exe`` runner -+++++++++++++++++++++++++++++++++++++++++ +Execution through the test executable ++++++++++++++++++++++++++++++++++++++ The advantage of passing through the Manifest-generated runner is that it only depends on the tests themselves and the tested modules (and @@ -59,17 +57,24 @@ arguments to Tezt, append ``-- `` to the above command:: dune exec src/lib_clic/test/main.exe -- --list -Execution through the Dune ``runtezt`` alias +Execution through the Dune ``runtest`` alias ++++++++++++++++++++++++++++++++++++++++++++ -The Manifest-generated ``runtezt`` alias can be used to execute all -Alcotezts in a folder and its sub-folders, recursively. For example, -to run all Alcotezts of protocol Alpha, run:: +The ``runtest`` alias can be used to execute all tests, including +Alcotezts, in a folder and its recursive sub-folders. For example, to +run all tests of protocol Alpha, run:: - dune build @src/proto_alpha/runtezt + dune build @src/proto_alpha/runtest On the other hand, there is no convenient way to pass arguments to the -underlying Tezt binaries with this method. +underlying tests with this method. + +The Alcotezts can be dynamically disabled in the ``runtest`` alias by +setting the environment variable ``RUNTEZTALIAS`` to ``false``. For +instance, to run all the unit tests in protocol Alpha exception the +Alcotezts, you can run:: + + RUNTEZTALIAS=false dune build @src/proto_alpha/runtest Execution through the Tezt main entrypoint ++++++++++++++++++++++++++++++++++++++++++ @@ -157,15 +162,10 @@ There is no way to redirect the output of ``Printf``. Consequently, the output of Alcotezts that call this module directly cannot be hidden. -The ``runtest``/``runtezt`` aliases -+++++++++++++++++++++++++++++++++++ - -Alcotezts *are not* registered as a dependency on the ``runtest`` -alias. This is to avoid executing them when invoking other test -frameworks through the ``runtest`` alias in the CI. -That is, ``dune runtest $TEST_DIR`` will not -execute any Alcotezt contained in ``$TEST_DIR``. +Integration with the ``runtest`` aliases +++++++++++++++++++++++++++++++++++++++++ -Instead, Alcotezts registered through manifest create an alias ``runtezt``, that can be -used with ``dune build @$TEST_DIR/runtezt``, or one of the other methods described :ref:`above -`. +Alcotezts are registered as a dependency on the ``runtest`` +alias. However, they are not executed through this alias in +the CI. Instead, they run through the Tezt main runner to enable load +balancing. diff --git a/docs/developer/testing.rst b/docs/developer/testing.rst index 90dc19809176..6525523bb93f 100644 --- a/docs/developer/testing.rst +++ b/docs/developer/testing.rst @@ -198,8 +198,8 @@ Typical use cases: - Conversion of pre-existing Alcotests to Tezt Example tests: - - Unit tests for :package:`tezos-clic`. To execute them locally, run ``dune build @src/lib_clic/runtezt``. - - Unit tests for :package:`tezos-version`. To execute them locally, run ``dune build @src/lib_version/runtezt``. + - Unit tests for :package:`tezos-clic`. To execute them locally, run ``dune build @src/lib_clic/runtest``. + - Unit tests for :package:`tezos-version`. To execute them locally, run ``dune build @src/lib_version/runtest``. See :doc:`alcotezt` for more information on how to convert tests to Alcotezt, and how to execute them. diff --git a/docs/developer/tezt.rst b/docs/developer/tezt.rst index e87325588592..1ab4cc462745 100644 --- a/docs/developer/tezt.rst +++ b/docs/developer/tezt.rst @@ -248,10 +248,10 @@ Then, declare those files in ``manifest/main.ml``:: ~deps:[octez_base] This causes the manifest to generate executable ``src/lib_base/tezt/main.exe`` for you. -This executable calls ``Test.run``. It also declares a Dune alias ``runtezt`` +This executable calls ``Test.run``. It also declares a Dune alias ``runtest`` so that you can run your tests with either of the following commands:: - dune build @src/lib_base/runtezt + dune build @src/lib_base/runtest dune exec src/lib_base/tezt/main.exe Note that your tests will actually also be available in ``tezt/tests/main.exe``. diff --git a/manifest/main.ml b/manifest/main.ml index 850b9b4c045c..96446244d8a6 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -4862,7 +4862,7 @@ end = struct but the test uses absolute paths to find those files (thanks to [DUNE_SOURCEROOT] and [Filename.dirname __FILE__]), so those copies are not actually used. This is needed so that the test - can be run either with [dune build @runtezt], + can be run either with [dune build @runtest], with [dune exec src/proto_alpha/lib_protocol/test/regression/main.exe], or with [dune exec tezt/tests/main.exe -- -f test_logging.ml]. *) let _ = -- GitLab