| Message ID | 20220523181120.54547-1-jarkko@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] selftests/sgx: add test_encl.elf to TEST_GEN_FILES | expand |
On Mon, May 23, 2022 at 09:11:20PM +0300, Jarkko Sakkinen wrote: > TEST_GEN_FILES contains files that are generated during compilation and are > required to be included together with the test binaries, e.g. when > performing: > > make -C tools/testing/selftests install INSTALL_PATH=/some/other/path [*] > > Add test_encl.elf to TEST_GEN_FILES because otherwise the installed test > binary will fail to run. > > [*] https://docs.kernel.org/dev-tools/kselftest.html > > Cc: stable@vger.kernel.org > Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX") > Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> > --- > v2: > Use TEST_GEN_FILES in the "all" target, instead of duplicating the path for > test_encl.elf. > --- > tools/testing/selftests/sgx/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile > index 75af864e07b6..7f60811b5b20 100644 > --- a/tools/testing/selftests/sgx/Makefile > +++ b/tools/testing/selftests/sgx/Makefile > @@ -17,9 +17,10 @@ ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \ > -fno-stack-protector -mrdrnd $(INCLUDES) > > TEST_CUSTOM_PROGS := $(OUTPUT)/test_sgx > +TEST_GEN_FILES := $(OUTPUT)/test_encl.elf > > ifeq ($(CAN_BUILD_X86_64), 1) > -all: $(TEST_CUSTOM_PROGS) $(OUTPUT)/test_encl.elf > +all: $(TEST_CUSTOM_PROGS) $(TEST_GEN_FILES) > endif > > $(OUTPUT)/test_sgx: $(OUTPUT)/main.o \ > -- > 2.36.1 > Dave, would it be by any means possible to pick this? My workload is kernel testing with buildroot [*]. [*] Related: https://lore.kernel.org/buildroot/2c42570b01b2b51cc33d6623b25a736e4f20c601.camel@iki.fi/T/#t BR, Jarkko
On 5/25/22 6:39 PM, Jarkko Sakkinen wrote: > On Mon, May 23, 2022 at 09:11:20PM +0300, Jarkko Sakkinen wrote: >> TEST_GEN_FILES contains files that are generated during compilation and are >> required to be included together with the test binaries, e.g. when >> performing: >> >> make -C tools/testing/selftests install INSTALL_PATH=/some/other/path [*] >> >> Add test_encl.elf to TEST_GEN_FILES because otherwise the installed test >> binary will fail to run. >> >> [*] https://docs.kernel.org/dev-tools/kselftest.html >> >> Cc: stable@vger.kernel.org >> Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX") >> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> >> --- >> v2: >> Use TEST_GEN_FILES in the "all" target, instead of duplicating the path for >> test_encl.elf. >> --- >> tools/testing/selftests/sgx/Makefile | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile >> index 75af864e07b6..7f60811b5b20 100644 >> --- a/tools/testing/selftests/sgx/Makefile >> +++ b/tools/testing/selftests/sgx/Makefile >> @@ -17,9 +17,10 @@ ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \ >> -fno-stack-protector -mrdrnd $(INCLUDES) >> >> TEST_CUSTOM_PROGS := $(OUTPUT)/test_sgx >> +TEST_GEN_FILES := $(OUTPUT)/test_encl.elf >> >> ifeq ($(CAN_BUILD_X86_64), 1) >> -all: $(TEST_CUSTOM_PROGS) $(OUTPUT)/test_encl.elf >> +all: $(TEST_CUSTOM_PROGS) $(TEST_GEN_FILES) >> endif >> >> $(OUTPUT)/test_sgx: $(OUTPUT)/main.o \ >> -- >> 2.36.1 >> > > Dave, would it be by any means possible to pick this? My workload is > kernel testing with buildroot [*]. > > [*] Related: > https://lore.kernel.org/buildroot/2c42570b01b2b51cc33d6623b25a736e4f20c601.camel@iki.fi/T/#t > > BR, Jarkko > I can pick this up with ack from Dave or here is mine to go through Dave's Reviewed-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile index 75af864e07b6..7f60811b5b20 100644 --- a/tools/testing/selftests/sgx/Makefile +++ b/tools/testing/selftests/sgx/Makefile @@ -17,9 +17,10 @@ ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \ -fno-stack-protector -mrdrnd $(INCLUDES) TEST_CUSTOM_PROGS := $(OUTPUT)/test_sgx +TEST_GEN_FILES := $(OUTPUT)/test_encl.elf ifeq ($(CAN_BUILD_X86_64), 1) -all: $(TEST_CUSTOM_PROGS) $(OUTPUT)/test_encl.elf +all: $(TEST_CUSTOM_PROGS) $(TEST_GEN_FILES) endif $(OUTPUT)/test_sgx: $(OUTPUT)/main.o \
TEST_GEN_FILES contains files that are generated during compilation and are required to be included together with the test binaries, e.g. when performing: make -C tools/testing/selftests install INSTALL_PATH=/some/other/path [*] Add test_encl.elf to TEST_GEN_FILES because otherwise the installed test binary will fail to run. [*] https://docs.kernel.org/dev-tools/kselftest.html Cc: stable@vger.kernel.org Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX") Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> --- v2: Use TEST_GEN_FILES in the "all" target, instead of duplicating the path for test_encl.elf. --- tools/testing/selftests/sgx/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)