Skip to content

Commit da98704

Browse files
raoulstrackxraoulstrackx
committed
Restructuring folders
1 parent 0edaf72 commit da98704

File tree

157 files changed

+18
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+18
-17
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ matrix:
2828
- RUST_BACKTRACE=1 LLVM_CONFIG_PATH=llvm-3.8-config
2929
before_script:
3030
- rustup target add x86_64-fortanix-unknown-sgx x86_64-unknown-linux-musl
31+
- cd intel-sgx
3132
script:
32-
- 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" ]
33+
- 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" ]
3334
- cargo test --verbose --locked -p sgx-isa --features sgxstd --target x86_64-fortanix-unknown-sgx --no-run
3435
- cargo test --verbose --locked -p sgxs-tools --features pe2sgxs --bin isgx-pe2sgx
3536
- cargo test --verbose --locked -p dcap-ql --features link

‎Cargo.toml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[workspace]
22
members = [
3-
"aesm-client",
4-
"dcap-provider",
5-
"dcap-ql-sys",
6-
"dcap-ql",
7-
"dcap-retrieve-pckid",
8-
"enclave-runner",
9-
"fortanix-sgx-abi",
10-
"fortanix-sgx-tools",
3+
"intel-sgx/aesm-client",
4+
"intel-sgx/dcap-provider",
5+
"intel-sgx/dcap-ql-sys",
6+
"intel-sgx/dcap-ql",
7+
"intel-sgx/dcap-retrieve-pckid",
8+
"intel-sgx/enclave-runner",
9+
"intel-sgx/fortanix-sgx-abi",
10+
"intel-sgx/fortanix-sgx-tools",
1111
"ipc-queue",
12-
"report-test",
12+
"intel-sgx/report-test",
1313
"rs-libc",
14-
"sgxs",
15-
"sgx-isa",
16-
"sgx-pkix",
17-
"sgxs-loaders",
18-
"sgxs-tools"
14+
"intel-sgx/sgxs",
15+
"intel-sgx/sgx-isa",
16+
"intel-sgx/sgx-pkix",
17+
"intel-sgx/sgxs-loaders",
18+
"intel-sgx/sgxs-tools"
1919
]
2020
exclude = ["examples"]

aesm-client/Cargo.toml renamed to intel-sgx/aesm-client/Cargo.toml

File renamed without changes.

aesm-client/build.rs renamed to intel-sgx/aesm-client/build.rs

File renamed without changes.

aesm-client/src/aesm_proto.proto renamed to intel-sgx/aesm-client/src/aesm_proto.proto

File renamed without changes.

aesm-client/src/error.rs renamed to intel-sgx/aesm-client/src/error.rs

File renamed without changes.

aesm-client/src/imp/aesm_protobuf/mod.rs renamed to intel-sgx/aesm-client/src/imp/aesm_protobuf/mod.rs

File renamed without changes.

aesm-client/src/imp/sgx.rs renamed to intel-sgx/aesm-client/src/imp/sgx.rs

File renamed without changes.

aesm-client/src/imp/unix.rs renamed to intel-sgx/aesm-client/src/imp/unix.rs

File renamed without changes.

aesm-client/src/imp/windows.rs renamed to intel-sgx/aesm-client/src/imp/windows.rs

File renamed without changes.

0 commit comments

Comments
 (0)