Skip to content

Commit

Permalink
Remove target test-no-init-psa
Browse files Browse the repository at this point in the history
  • Loading branch information
j-devel committed Sep 23, 2024
1 parent f166501 commit d30d877
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "minerva-mbedtls"
version = "0.5.2"
version = "0.5.3"
edition = "2018"
authors = ["ANIMA Minerva toolkit"]

Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ test-examples:
for name in $(NAMES); do \
make -C ./examples/$$name test || exit 1; done

test-no-init-psa:
@echo '⚠️ Expect error 101 from `cargo test`'
( cargo test --manifest-path ./test/Cargo.toml --features "no-init-psa" && exit 1 ) || [ $$? -eq 101 ]
@echo '^^^^^ ✅ Got error 101 as expected from `cargo test`'

test-x86_64:
cargo build --lib --release
cargo test --manifest-path ./test/Cargo.toml
Expand All @@ -41,5 +36,4 @@ test-x86:
test:
make test-x86_64
make test-x86
make test-no-init-psa
make test-examples
1 change: 0 additions & 1 deletion test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ path = "test.rs"
[features]
default = ["minerva-mbedtls"]
std = ["minerva-mbedtls/std"]
no-init-psa = []

[dependencies]
mcu-if = { git = "https://github.com/AnimaGUS-minerva/mcu-if", rev = "da77a48" }
Expand Down
9 changes: 3 additions & 6 deletions test/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,9 @@ pub fn test_utils_is_asn1_signature() -> Result<(), mbedtls_error> {

#[cfg(test)]
fn init_psa_crypto() {
#[cfg(not(feature = "no-init-psa"))]
{
use minerva_mbedtls::psa_crypto;
psa_crypto::init().unwrap();
psa_crypto::initialized().unwrap();
}
use minerva_mbedtls::psa_crypto;
psa_crypto::init().unwrap();
psa_crypto::initialized().unwrap();
}

#[test] fn md(){ test_md().unwrap() }
Expand Down

0 comments on commit d30d877

Please sign in to comment.