Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move self test logic to a separate crate #244

Merged
merged 5 commits into from
Apr 13, 2023
Merged

Move self test logic to a separate crate #244

merged 5 commits into from
Apr 13, 2023

Conversation

Taowyoo
Copy link
Collaborator

@Taowyoo Taowyoo commented Apr 12, 2023

This PR is for fixing the link error: multiple define of mbedtls_printf when have different versions of mbedtls in dependency tree.

According to @jethrogb 's idea:

I am proposing to create a new crate mbedtls-selftest which in Cargo.toml specifies links = mbedtls-selftest-support. It basically contains only the self_test module and the build script. All versions of MbedTLS would be updated to depend on a single version of mbedtls-selftest-support.

The problem could be fixed by

  • moving selftest related implementation in mbedtls into a separate crate, here I named it: mbedtls-selftest (Done by this PR)
  • back-port this PR to old versions: such as 0.7.2 0.8.1

mbedtls/build.rs Outdated Show resolved Hide resolved
@jethrogb
Copy link
Member

bors r+

bors bot added a commit that referenced this pull request Apr 12, 2023
244: Move self test logic to a separate crate r=jethrogb a=Taowyoo

This PR is for fixing the link error: multiple define of `mbedtls_printf` when have different versions of `mbedtls` in dependency tree.

According to `@jethrogb` 's idea:
> I am proposing to create a new crate mbedtls-selftest which in Cargo.toml specifies links = mbedtls-selftest-support. It basically contains only the self_test module and the build script. All versions of MbedTLS would be updated to depend on a single version of mbedtls-selftest-support.


The problem could be fixed by
- moving `selftest` related implementation in `mbedtls` into a separate crate, here I named it: `mbedtls-selftest` (Done by this PR)
- back-port this PR to old versions: such as `0.7.2` `0.8.1`



Co-authored-by: Yuxiang Cao <[email protected]>
Co-authored-by: YX Citrus <[email protected]>
@Taowyoo
Copy link
Collaborator Author

Taowyoo commented Apr 12, 2023

I will create back-port PRs if this PR successfully merged, after back-port, new versions also need to be published

  • 0.7.2 -> 0.7.3 at branch v0.7
  • 0.8.2 -> 0.8.3 at branch v0.8 which is just created based on rust-sgx's Cargo.lock

@jethrogb
Copy link
Member

bors r-

@bors
Copy link
Contributor

bors bot commented Apr 12, 2023

Canceled.

mbedtls/Cargo.toml Outdated Show resolved Hide resolved
mbedtls/Cargo.toml Outdated Show resolved Hide resolved
- Update `mbedtls-selftest`'s dependency of `mbedtls-sys-auto` to sync with `mbedtls`
- Cleanup `mbedtls`'s feature requirements on `mbedtls-sys-auto`
@Taowyoo Taowyoo requested a review from jethrogb April 12, 2023 17:31
@Taowyoo

This comment was marked as resolved.

@jethrogb
Copy link
Member

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 13, 2023

Build succeeded:

  • continuous-integration/travis-ci/push

@bors bors bot merged commit e89e0ea into master Apr 13, 2023
@Taowyoo Taowyoo deleted the yx/selftest-crate branch April 13, 2023 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants