diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1248e311a..d6f6d88f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,7 @@ build: dependencies: - build -test:opam: +test:opam_packaging: <<: *test_definition script: - ./scripts/check_opam_test.sh "$CI_PROJECT_DIR/$CI_CONFIG_PATH" @@ -99,70 +99,90 @@ test:ocp-indent: script: - jbuilder build @runtest_indent -test:utils: +test:stdlib: <<: *test_definition script: - - jbuilder build @test/utils/runtest + - jbuilder build @src/lib_stdlib/runtest + +test:stdlib_lwt: + <<: *test_definition + script: + - jbuilder build @src/lib_stdlib_lwt/runtest + +test:data_encoding: + <<: *test_definition + script: + - jbuilder build @src/lib_data_encoding/runtest + +test:storage: + <<: *test_definition + script: + - jbuilder build @src/lib_storage/runtest + +test:crypto: + <<: *test_definition + script: + - jbuilder build @src/lib_crypto/runtest test:shell: <<: *test_definition script: - - jbuilder build @test/shell/runtest + - jbuilder build @src/lib_shell/runtest test:p2p:io-scheduler: <<: *test_definition script: - - jbuilder build @test/p2p/runtest_p2p_io_scheduler + - jbuilder build @src/lib_p2p/runtest_p2p_io_scheduler test:p2p:socket: <<: *test_definition script: - - jbuilder build @test/p2p/runtest_p2p_socket + - jbuilder build @src/lib_p2p/runtest_p2p_socket test:p2p:pool: <<: *test_definition script: - - jbuilder build @test/p2p/runtest_p2p_pool + - jbuilder build @src/lib_p2p/runtest_p2p_pool -test:proto_alpha_isolate: +test:proto_alpha: <<: *test_definition script: - - jbuilder build @test/proto_alpha_isolate/runtest_isolate_main + - jbuilder build @src/proto_alpha/runtest -test:proto_alpha:transaction: +test:client_alpha:transaction: <<: *test_definition script: - - jbuilder build @test/proto_alpha/runtest_transaction + - jbuilder build @src/proto_alpha/lib_client/runtest_transaction -test:proto_alpha:origination: +test:client_alpha:origination: <<: *test_definition script: - - jbuilder build @test/proto_alpha/runtest_origination + - jbuilder build @src/proto_alpha/lib_client/runtest_origination -test:proto_alpha:endorsement: +test:client_alpha:endorsement: <<: *test_definition script: - - jbuilder build @test/proto_alpha/runtest_endorsement + - jbuilder build @src/proto_alpha/lib_client/runtest_endorsement -test:proto_alpha:vote: +test:client_alpha:vote: <<: *test_definition script: - - jbuilder build @test/proto_alpha/runtest_vote + - jbuilder build @src/proto_alpha/lib_client/runtest_vote test:basic.sh: <<: *test_definition script: - - jbuilder build @test/runtest_basic.sh + - jbuilder build @src/bin_client/runtest_basic.sh test:contracts.sh: <<: *test_definition script: - - jbuilder build @test/runtest_contracts.sh + - jbuilder build @src/bin_client/runtest_contracts.sh test:multinode.sh: <<: *test_definition script: - - jbuilder build @test/runtest_multinode.sh + - jbuilder build @src/bin_client/runtest_multinode.sh test:proto:sandbox: <<: *test_definition @@ -362,12 +382,7 @@ opam:34:ocplib-ezresto-directory: variables: package: ocplib-ezresto-directory -opam:35:tezos-test: - <<: *opam_definition - variables: - package: tezos-test - -opam:36:tezos-protocol-demo: +opam:35:tezos-protocol-demo: <<: *opam_definition variables: package: tezos-protocol-demo diff --git a/src/lib_crypto/tezos-crypto.opam b/src/lib_crypto/tezos-crypto.opam index cbc32b7bc..a8e24836f 100644 --- a/src/lib_crypto/tezos-crypto.opam +++ b/src/lib_crypto/tezos-crypto.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-stdlib" "tezos-stdlib-lwt" "tezos-data-encoding" diff --git a/src/lib_data_encoding/tezos-data-encoding.opam b/src/lib_data_encoding/tezos-data-encoding.opam index daa18e7e8..f530d2189 100644 --- a/src/lib_data_encoding/tezos-data-encoding.opam +++ b/src/lib_data_encoding/tezos-data-encoding.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-stdlib" "ocplib-json-typed" "ocplib-endian" diff --git a/src/lib_p2p/tezos-p2p.opam b/src/lib_p2p/tezos-p2p.opam index 428d8be2e..33ab6191f 100644 --- a/src/lib_p2p/tezos-p2p.opam +++ b/src/lib_p2p/tezos-p2p.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-base" ] build: [ diff --git a/src/lib_shell/tezos-shell.opam b/src/lib_shell/tezos-shell.opam index 0f69a3be8..ec5274000 100644 --- a/src/lib_shell/tezos-shell.opam +++ b/src/lib_shell/tezos-shell.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-base" "tezos-rpc-http" "tezos-p2p" diff --git a/src/lib_stdlib/tezos-stdlib.opam b/src/lib_stdlib/tezos-stdlib.opam index b52a3ceb9..021375fb9 100644 --- a/src/lib_stdlib/tezos-stdlib.opam +++ b/src/lib_stdlib/tezos-stdlib.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "cstruct" "hex" "ocplib-endian" diff --git a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam b/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam index 103c21587..65a804589 100644 --- a/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam +++ b/src/lib_stdlib_lwt/tezos-stdlib-lwt.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-stdlib" "tezos-data-encoding" "tezos-error-monad" diff --git a/src/lib_storage/tezos-storage.opam b/src/lib_storage/tezos-storage.opam index 5badb9f90..ad9105c6a 100644 --- a/src/lib_storage/tezos-storage.opam +++ b/src/lib_storage/tezos-storage.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-base" "leveldb" "irmin-leveldb" diff --git a/src/proto_alpha/lib_client/tezos-client-alpha.opam b/src/proto_alpha/lib_client/tezos-client-alpha.opam index 69dbaa00b..70bcbde1a 100644 --- a/src/proto_alpha/lib_client/tezos-client-alpha.opam +++ b/src/proto_alpha/lib_client/tezos-client-alpha.opam @@ -9,6 +9,7 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } "tezos-base" "tezos-protocol-environment-client" "tezos-protocol-alpha" diff --git a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam index 22f08d56d..5553f0b9c 100644 --- a/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam +++ b/src/proto_alpha/lib_protocol/tezos-embedded-protocol-alpha.opam @@ -9,11 +9,11 @@ license: "unreleased" depends: [ "ocamlfind" { build } "jbuilder" { build & >= "1.0+beta15" } + "tezos-test-helpers" { test } + "tezos-embedded-protocol-genesis" { test } "tezos-protocol-compiler" "tezos-protocol-updater" "tezos-shell" - "tezos-test-helpers" { test } - "tezos-embedded-protocol-genesis" { test } ] build: [ [ "rm" "jbuild" "src/jbuild" ]