Skip to contentSkip to conversation

selftests/sgx: add test_encl.elf to TEST_GEN_FILES

PATCH In review Jarkko Sakkinen 2 participants 3 messages May 23, 2022 – Jun 9, 2022

Subsystems (3)
lore
Share & tools
lore

Jarkko Sakkinen

author maintainer
#0 lore raw

PATCH v2 1/1 selftests/sgx: add test_encl.elf to TEST_GEN_FILES

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

Fixes 2adcba79e69d ("selftests/x86: Add a selftest for SGX")

---
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(-)
tools/testing/selftests/sgx/Makefile +2 -1
index 75af864e07b6..7f60811b5b20 100644
@@ -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 \
Signature · 1 line
2.36.1
author maintainer
#1 lore raw
Quoted 41 lines · Jarkko Sakkinen

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

Fixes 2adcba79e69d ("selftests/x86: Add a selftest for SGX")

---
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(-)
tools/testing/selftests/sgx/Makefile +2 -1
index 75af864e07b6..7f60811b5b20 100644
@@ -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 \
Signature · 1 line
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/[email protected]/T/#t

BR, Jarkko

maintainer Reviewed-by
#2 lore raw
Quoted 46 lines · Jarkko Sakkinen
Quoted 41 lines · Jarkko Sakkinen

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

Fixes 2adcba79e69d ("selftests/x86: Add a selftest for SGX")

---
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(-)
tools/testing/selftests/sgx/Makefile +2 -1
index 75af864e07b6..7f60811b5b20 100644
@@ -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 \
Signature · 1 line
2.36.1

Dave, would it be by any means possible to pick this? My workload is kernel testing with buildroot [*].

Quoted 5 lines

[*] Related:

     https://lore.kernel.org/buildroot/[email protected]/T/#t

BR, Jarkko

I can pick this up with ack from Dave or here is mine to go through Dave's

thanks,
-- Shuah