On Fri, Mar 20, 2020 at 07:47:16PM +0200, Jarkko Sakkinen wrote:
> Move selftest under the top level selftests directory so that we don't
> need to clutter x86/Makefile. The changes made for x86/Makefile caused
> also issues with packaging the selftests. Finally, SGX assets need their
> own tailored compilation environment.
>
> With this change BuildRoot nicely packages both standard x86 selftests
> and our SGX test.
>
> Cc: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx>
> ---
> tools/testing/selftests/Makefile | 1 +
> tools/testing/selftests/{x86 => }/sgx/.gitignore | 0
> tools/testing/selftests/{x86 => }/sgx/Makefile | 12 +++++++++---
> tools/testing/selftests/{x86 => }/sgx/call.S | 0
> tools/testing/selftests/{x86 => }/sgx/defines.h | 4 ++--
> tools/testing/selftests/{x86 => }/sgx/encl.c | 0
> tools/testing/selftests/{x86 => }/sgx/encl.lds | 0
> .../testing/selftests/{x86 => }/sgx/encl_bootstrap.S | 0
> tools/testing/selftests/{x86 => }/sgx/main.c | 0
> tools/testing/selftests/{x86 => }/sgx/main.h | 0
> tools/testing/selftests/{x86 => }/sgx/sign.c | 0
> 11 files changed, 12 insertions(+), 5 deletions(-)
> rename tools/testing/selftests/{x86 => }/sgx/.gitignore (100%)
> rename tools/testing/selftests/{x86 => }/sgx/Makefile (83%)
> rename tools/testing/selftests/{x86 => }/sgx/call.S (100%)
> rename tools/testing/selftests/{x86 => }/sgx/defines.h (71%)
> rename tools/testing/selftests/{x86 => }/sgx/encl.c (100%)
> rename tools/testing/selftests/{x86 => }/sgx/encl.lds (100%)
> rename tools/testing/selftests/{x86 => }/sgx/encl_bootstrap.S (100%)
> rename tools/testing/selftests/{x86 => }/sgx/main.c (100%)
> rename tools/testing/selftests/{x86 => }/sgx/main.h (100%)
> rename tools/testing/selftests/{x86 => }/sgx/sign.c (100%)
>
> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
> index 6ec503912bea..183a050b5bda 100644
> --- a/tools/testing/selftests/Makefile
> +++ b/tools/testing/selftests/Makefile
> @@ -63,6 +63,7 @@ TARGETS += user
> TARGETS += vm
> TARGETS += x86
> TARGETS += zram
> +TARGETS += sgx
The scope of the subject for the selftest patch probably should be changed
to drop the "x86" part, e.g.
selftests/sgx: Add a selftest for SGX
or
selftests: Add a selftest for SGX
instead of
selftests/x86: Add a selftest for SGX
