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

Cancel queue + async usercall interface #404

Closed
wants to merge 11 commits into from
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ matrix:
- clang-11
- musl-tools
rust:
- stable
# This need to change back to `nightly` after https://github.com/fortanix/rust-sgx/issues/433 is fixed
- nightly-2023-01-31
env:
- RUST_BACKTRACE=1
- CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
Expand All @@ -44,7 +45,8 @@ matrix:
- rustup toolchain add nightly
- rustup target add x86_64-fortanix-unknown-sgx --toolchain nightly
script:
- cargo test --verbose --locked --all --exclude sgxs-loaders && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
- cargo test --verbose --locked --all --exclude sgxs-loaders --exclude async-usercalls && [ "$(echo $(nm -D target/debug/sgx-detect|grep __vdso_sgx_enter_enclave))" = "w __vdso_sgx_enter_enclave" ]
- cargo test --verbose --locked -p async-usercalls --target x86_64-fortanix-unknown-sgx --no-run
- cargo test --verbose --locked -p dcap-ql --features link
- cargo test --verbose --locked -p dcap-ql --features verify
- cargo test --verbose --locked -p ias --features mbedtls
Expand Down
141 changes: 95 additions & 46 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ members = [
"fortanix-vme/tests/iron",
"fortanix-vme/vme-pkix",
"intel-sgx/aesm-client",
"intel-sgx/async-usercalls",
"intel-sgx/dcap-provider",
"intel-sgx/dcap-ql-sys",
"intel-sgx/dcap-ql",
Expand Down
3 changes: 3 additions & 0 deletions doc/generate-api-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ for LIB in $LIBS_SORTED; do
if FEATURES="$(cargo read-manifest|jq -r '.metadata.docs.rs.features | join(",")' 2> /dev/null)"; then
ARGS="--features $FEATURES"
fi
if grep -q 'feature(sgx_platform)' ./src/lib.rs; then
ARGS="$ARGS --target x86_64-fortanix-unknown-sgx"
fi
cargo doc --no-deps --lib $ARGS
popd
fi
Expand Down
Loading