From 463689979e6aa962dd1e072eab36e65b1d999bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gonz=C3=A1lez?= Date: Thu, 7 Sep 2023 15:55:10 +0100 Subject: [PATCH 1/2] ci: Stop service in each iteration of the coverage build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The final service in each provider iteration of the coverage build is left running before the next iteration begins. This is causing clashes when running tests. Stop the service before starting the new provider build. Signed-off-by: Tomás González --- ci.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci.sh b/ci.sh index 7654f90b..881cfbfd 100755 --- a/ci.sh +++ b/ci.sh @@ -292,6 +292,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then wait_for_service run_key_mappings_tests + stop_service done # Run unit tests From 4eede1ded17e745ef12d819d3d19e73f2028ed12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Gonz=C3=A1lez?= Date: Thu, 7 Sep 2023 21:38:32 +0100 Subject: [PATCH 2/2] Revert "Fix coverage builds for different providers" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6c25da56958c3bb46a4997950de18412345f1d58. Signed-off-by: Tomás González --- ci.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.sh b/ci.sh index 881cfbfd..4b847b0c 100755 --- a/ci.sh +++ b/ci.sh @@ -250,7 +250,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then rustup toolchain install 1.66.0 PROVIDERS="trusted-service mbed-crypto tpm pkcs11" EXCLUDES="fuzz/*,e2e_tests/*,src/providers/cryptoauthlib/*,src/authenticators/jwt_svid_authenticator/*" - UNIT_TEST_COMMON_FEATURES="unix-peer-credentials-authenticator,direct-authenticator" + UNIT_TEST_FEATURES="unix-peer-credentials-authenticator,direct-authenticator" # Install tarpaulin cargo +1.66.0 install cargo-tarpaulin @@ -260,7 +260,7 @@ if [ "$PROVIDER_NAME" = "coverage" ]; then # Set up run PROVIDER_NAME=$provider TEST_FEATURES="--features=$provider-provider" - UNIT_TEST_FEATURES="$UNIT_TEST_COMMON_FEATURES,$provider-provider" + UNIT_TEST_FEATURES="$UNIT_TEST_FEATURES,$provider-provider" cp $(pwd)/e2e_tests/provider_cfg/$provider/config.toml $CONFIG_PATH mkdir -p reports/$provider