Merge #385

385: Moving generic tests to fortanix-vme directory r=raoulstrackx a=raoulstrackx



Co-authored-by: Raoul Strackx <[email protected]>

Author: bors[bot]

Cargo.toml

@@ -3,14 +3,14 @@ members = [
     "fortanix-vme/aws-nitro-enclaves/eif-tools",
     "fortanix-vme/aws-nitro-enclaves/nsm",
     "fortanix-vme/aws-nitro-enclaves/nitro-attestation-verify",
-    "fortanix-vme/aws-nitro-enclaves/tests/hello_world",
-    "fortanix-vme/aws-nitro-enclaves/tests/outgoing_connection",
-    "fortanix-vme/aws-nitro-enclaves/tests/incoming_connection",
-    "fortanix-vme/aws-nitro-enclaves/tests/iron",
     "fortanix-vme/aws-nitro-enclaves/tests/nsm-test",
-    "fortanix-vme/vme-pkix",
     "fortanix-vme/fortanix-vme-abi",
     "fortanix-vme/fortanix-vme-runner",
+    "fortanix-vme/tests/hello_world",
+    "fortanix-vme/tests/outgoing_connection",
+    "fortanix-vme/tests/incoming_connection",
+    "fortanix-vme/tests/iron",
+    "fortanix-vme/vme-pkix",
     "intel-sgx/aesm-client",
     "intel-sgx/dcap-provider",
     "intel-sgx/dcap-ql-sys",

fortanix-vme/ci-common.sh

@@ -66,7 +66,7 @@ function compile {
 
 function cargo_test {
     name=$1
-    pushd ${repo_root}/fortanix-vme/aws-nitro-enclaves/tests/$name
+    pushd $(find ${repo_root} -type d -wholename "*/tests/${name}")
     out=$(mktemp /tmp/$name.out.XXXXX)
     err=$(mktemp /tmp/$name.err.XXXXX)