[bpf-next,1/2] selftests: bpf: test_lwt_ip_encap: add missing object file to TEST_FILES

Message ID 20191110092616.24842-1-anders.roxell@linaro.org
State New
Headers show
Series
  • [bpf-next,1/2] selftests: bpf: test_lwt_ip_encap: add missing object file to TEST_FILES
Related show

Commit Message

Anders Roxell Nov. 10, 2019, 9:26 a.m.
When installing kselftests to its own directory and running the
test_lwt_ip_encap.sh it will complain that test_lwt_ip_encap.o can't be
find.

$ ./test_lwt_ip_encap.sh
starting egress IPv4 encap test
Error opening object test_lwt_ip_encap.o: No such file or directory
Object hashing failed!
Cannot initialize ELF context!
Failed to parse eBPF program: Invalid argument

Rework to add test_lwt_ip_encap.o to TEST_FILES so the object file gets
installed when installing kselftest.

Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

Acked-by: Song Liu <songliubraving@fb.com>

---
 tools/testing/selftests/bpf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.20.1

Comments

Simon Horman Nov. 11, 2019, 12:45 p.m. | #1
On Sun, Nov 10, 2019 at 10:26:16AM +0100, Anders Roxell wrote:
> When installing kselftests to its own directory and running the

> test_tc_edt.sh it will complain that test_tc_edt.o can't be find.

> 

> $ ./test_tc_edt.sh

> Error opening object test_tc_edt.o: No such file or directory

> Object hashing failed!

> Cannot initialize ELF context!

> Unable to load program

> 

> Rework to add test_tc_edt.o to TEST_FILES so the object file gets

> installed when installing kselftest.

> 

> Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")

> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

> Acked-by: Song Liu <songliubraving@fb.com>


It seems to me that the two patches that comprise this series
should be combined as they seem to be fixing two halves of the same
problem.

> ---

>  tools/testing/selftests/bpf/Makefile | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile

> index cc09b5df9403..b03dc2298fea 100644

> --- a/tools/testing/selftests/bpf/Makefile

> +++ b/tools/testing/selftests/bpf/Makefile

> @@ -38,7 +38,8 @@ TEST_GEN_PROGS += test_progs-bpf_gcc

>  endif

>  

>  TEST_GEN_FILES =

> -TEST_FILES = test_lwt_ip_encap.o

> +TEST_FILES = test_lwt_ip_encap.o \

> +	test_tc_edt.o

>  

>  # Order correspond to 'make run_tests' order

>  TEST_PROGS := test_kmod.sh \

> -- 

> 2.20.1

>
Daniel Borkmann Nov. 11, 2019, 1:01 p.m. | #2
On 11/11/19 1:45 PM, Simon Horman wrote:
> On Sun, Nov 10, 2019 at 10:26:16AM +0100, Anders Roxell wrote:

>> When installing kselftests to its own directory and running the

>> test_tc_edt.sh it will complain that test_tc_edt.o can't be find.

>>

>> $ ./test_tc_edt.sh

>> Error opening object test_tc_edt.o: No such file or directory

>> Object hashing failed!

>> Cannot initialize ELF context!

>> Unable to load program

>>

>> Rework to add test_tc_edt.o to TEST_FILES so the object file gets

>> installed when installing kselftest.

>>

>> Fixes: 74b5a5968fe8 ("selftests/bpf: Replace test_progs and test_maps w/ general rule")

>> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>

>> Acked-by: Song Liu <songliubraving@fb.com>

> 

> It seems to me that the two patches that comprise this series

> should be combined as they seem to be fixing two halves of the same

> problem.


Yep, agree, please respin as single patch.

Thanks,
Daniel

Patch

diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index b334a6db15c1..cc09b5df9403 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -38,7 +38,7 @@  TEST_GEN_PROGS += test_progs-bpf_gcc
 endif
 
 TEST_GEN_FILES =
-TEST_FILES =
+TEST_FILES = test_lwt_ip_encap.o
 
 # Order correspond to 'make run_tests' order
 TEST_PROGS := test_kmod.sh \