minor-makefile-fixes: added sgx-test-collateral and nitro-test-collateral to rules
...missing target dependencies causing issues when building some SGX and Nitro targets as policies and other bits of test collateral were not being built.
@@ -83,7 +83,7 @@ veracruz-server-test/proxy-attestation-server.db: $(wildcard sgx-root-enclave/cs
cd veracruz-server-test && \
bash ../test-collateral/populate-test-database.sh
-sgx-veracruz-server-test: sgx veracruz-server-test/proxy-attestation-server.db
+sgx-veracruz-server-test: sgx sgx-test-collateral veracruz-server-test/proxy-attestation-server.db
cd veracruz-server-test \
&& RUSTFLAGS=$(SGX_RUST_FLAG) cargo test --features sgx \
&& RUSTFLAGS=$(SGX_RUST_FLAG) cargo test test_debug --features sgx -- --ignored --test-threads=1
@@ -131,7 +131,7 @@ trustzone-veracruz-test: trustzone-test-collateral trustzone trustzone-test-env
trustzone-test-env: tz_test.sh run_tz_test.sh
chmod u+x $^
-nitro-veracruz-server-test: nitro veracruz-server-test/proxy-attestation-server.db
+nitro-veracruz-server-test: nitro nitro-test-collateral veracruz-server-test/proxy-attestation-server.db
cd veracruz-server-test \
&& RUSTFLAGS=$(NITRO_RUST_FLAG) cargo test --features nitro \
&& RUSTFLAGS=$(NITRO_RUST_FLAG) cargo test test_debug --features nitro,debug -- --ignored --test-threads=1
@@ -140,11 +140,11 @@ nitro-veracruz-server-test: nitro veracruz-server-test/proxy-attestation-server.
cd ./veracruz-server-test \
&& ./nitro-ec2-terminate_root.sh
-nitro-veracruz-server-test-dry-run: nitro
+nitro-veracruz-server-test-dry-run: nitro nitro-test-collateral
cd veracruz-server-test \
&& RUSTFLAGS=$(NITRO_RUST_FLAG) cargo test --features sgx --no-run
-nitro-veracruz-server-performance: nitro veracruz-server-test/proxy-attestation-server.db
+nitro-veracruz-server-performance: nitro nitro-test-collateral veracruz-server-test/proxy-attestation-server.db
cd veracruz-server-test \
&& RUSTFLAGS=$(NITRO_RUST_FLAG) cargo test test_performance_ --features nitro -- --ignored
cd veracruz-server-test \
@@ -152,11 +152,11 @@ nitro-veracruz-server-performance: nitro veracruz-server-test/proxy-attestation-
cd ./veracruz-server-test \
&& ./nitro-ec2-terminate-root.sh
-nitro-veracruz-test-dry-run: nitro
+nitro-veracruz-test-dry-run: nitro nitro-test-collateral
cd veracruz-test \
&& RUSTFLAGS=$(SGX_RUST_FLAG) cargo test --features nitro --no-run
-nitro-veracruz-test: nitro veracruz-test/proxy-attestation-server.db
+nitro-veracruz-test: nitro nitro-test-collateral veracruz-test/proxy-attestation-server.db
cd veracruz-test \
&& RUSTFLAGS=$(SGX_RUST_FLAG) cargo test --features nitro -- --test-threads=1
cd veracruz-server-test \
