From 2d4eb5a8ae66aaddd1c64a2454850e0b00bda6e5 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Fri, 4 Nov 2022 11:58:31 +0100 Subject: [PATCH 1/2] Benchmark: remove main.ml as it is unused --- src/lib_benchmark/test/main.ml | 28 ------------------------ src/lib_benchmark/test/test_inference.ml | 3 +++ 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 src/lib_benchmark/test/main.ml diff --git a/src/lib_benchmark/test/main.ml b/src/lib_benchmark/test/main.ml deleted file mode 100644 index 73de2b199b6f..000000000000 --- a/src/lib_benchmark/test/main.ml +++ /dev/null @@ -1,28 +0,0 @@ -(*****************************************************************************) -(* *) -(* Open Source License *) -(* Copyright (c) 2020 Nomadic Labs. *) -(* *) -(* Permission is hereby granted, free of charge, to any person obtaining a *) -(* copy of this software and associated documentation files (the "Software"),*) -(* to deal in the Software without restriction, including without limitation *) -(* the rights to use, copy, modify, merge, publish, distribute, sublicense, *) -(* and/or sell copies of the Software, and to permit persons to whom the *) -(* Software is furnished to do so, subject to the following conditions: *) -(* *) -(* The above copyright notice and this permission notice shall be included *) -(* in all copies or substantial portions of the Software. *) -(* *) -(* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR*) -(* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, *) -(* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL *) -(* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER*) -(* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING *) -(* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER *) -(* DEALINGS IN THE SOFTWARE. *) -(* *) -(*****************************************************************************) - -let () = - Alcotest_lwt.run "tezos-benchmark" [("inference", Test_inference.tests)] - |> Lwt_main.run diff --git a/src/lib_benchmark/test/test_inference.ml b/src/lib_benchmark/test/test_inference.ml index c30933919b9c..04e38d872d03 100644 --- a/src/lib_benchmark/test/test_inference.ml +++ b/src/lib_benchmark/test/test_inference.ml @@ -118,3 +118,6 @@ let test () = 30.0 < T.const && T.const < 36.0 && T.quadratic_term =~ 0.042 let tests = [Test.tztest_assert "regression" `Quick @@ test] + +let () = + Alcotest_lwt.run "tezos-benchmark" [("inference", tests)] |> Lwt_main.run -- GitLab From d3a81fe0e06127686986f1915ec377af0e26f4c2 Mon Sep 17 00:00:00 2001 From: Romain Bardou Date: Fri, 4 Nov 2022 11:59:15 +0100 Subject: [PATCH 2/2] Benchmark: convert tests to Alcotezt --- manifest/main.ml | 5 +-- opam/tezos-benchmark-tests.opam | 4 ++- src/lib_benchmark/test/dune | 55 ++++++++++++++++----------------- tezt/tests/dune | 3 +- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 0fd4b7274012..1a29d2fbb15d 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -3182,8 +3182,9 @@ let octez_benchmark_examples = ] let _octez_benchmark_tests = - tests + tezt [ + "test"; "test_sparse_vec"; "test_costlang"; "test_probe"; @@ -3195,7 +3196,7 @@ let _octez_benchmark_tests = ~synopsis:"Tezos: tests for lib-benchmarks" ~deps: [ - alcotest_lwt; + alcotezt; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_stdlib_unix; diff --git a/opam/tezos-benchmark-tests.opam b/opam/tezos-benchmark-tests.opam index d542840b3295..2f7622e316ad 100644 --- a/opam/tezos-benchmark-tests.opam +++ b/opam/tezos-benchmark-tests.opam @@ -10,7 +10,8 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "ocaml" { >= "4.14" } - "alcotest-lwt" { with-test & >= "1.5.0" } + "tezt" { with-test & >= "3.0.0" } + "octez-alcotezt" {with-test} "tezos-base" {with-test} "tezos-stdlib-unix" {with-test} "tezos-micheline" {with-test} @@ -22,5 +23,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: tests for lib-benchmarks" diff --git a/src/lib_benchmark/test/dune b/src/lib_benchmark/test/dune index 9c04c4134e76..8ce01ffb4c92 100644 --- a/src/lib_benchmark/test/dune +++ b/src/lib_benchmark/test/dune @@ -1,15 +1,12 @@ ; This file was automatically generated, do not edit. ; Edit file manifest/main.ml instead. -(executables - (names - test_sparse_vec - test_costlang - test_probe - test_measure - test_benchmark_helpers) +(library + (name src_lib_benchmark_test_tezt_lib) + (instrumentation (backend bisect_ppx)) (libraries - alcotest-lwt + tezt.core + octez-alcotezt tezos-base tezos-base.unix tezos-stdlib-unix @@ -17,31 +14,33 @@ tezos-crypto tezos-benchmark tezos-benchmark-examples) + (library_flags (:standard -linkall)) (flags (:standard) - -open Tezos_base.TzPervasives)) - -(rule - (alias runtest) - (package tezos-benchmark-tests) - (action (run %{dep:./test_sparse_vec.exe}))) - -(rule - (alias runtest) - (package tezos-benchmark-tests) - (action (run %{dep:./test_costlang.exe}))) + -open Tezt_core + -open Tezt_core.Base + -open Octez_alcotezt + -open Tezos_base.TzPervasives) + (modules + test + test_sparse_vec + test_costlang + test_probe + test_measure + test_benchmark_helpers)) -(rule - (alias runtest) - (package tezos-benchmark-tests) - (action (run %{dep:./test_probe.exe}))) +(executable + (name main) + (libraries + src_lib_benchmark_test_tezt_lib + tezt) + (modules main)) (rule - (alias runtest) + (alias runtezt) (package tezos-benchmark-tests) - (action (run %{dep:./test_measure.exe}))) + (action (run %{dep:./main.exe}))) (rule - (alias runtest) - (package tezos-benchmark-tests) - (action (run %{dep:./test_benchmark_helpers.exe}))) + (targets main.ml) + (action (with-stdout-to %{targets} (echo "let () = Tezt.Test.run ()")))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 17c606f1ebb4..c8bd0f1d30af 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -18,7 +18,8 @@ src_proto_015_PtLimaPt_lib_protocol_test_regression_tezt_lib src_lib_p2p_tezt_tezt_lib src_lib_lwt_result_stdlib_test_tezt_lib - src_lib_error_monad_test_tezt_lib) + src_lib_error_monad_test_tezt_lib + src_lib_benchmark_test_tezt_lib) (flags (:standard) -open Tezt -- GitLab