| Message ID | 159827024012.923543.7104106594870150597.stgit@firesoul |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf,V2] selftests/bpf: Fix test_progs-flavor run getting number of tests | expand |
On Mon, Aug 24, 2020 at 4:57 AM Jesper Dangaard Brouer <brouer@redhat.com> wrote: > > Commit 643e7233aa94 ("selftests/bpf: Test_progs option for getting number of > tests") introduced ability to getting number of tests, which is targeted > towards scripting. As demonstrate in the commit the number can be use as a > shell variable for further scripting. > > The test_progs program support "flavor", which is detected by the binary > have a "-flavor" in the executable name. One example is test_progs-no_alu32, > which load bpf-progs compiled with disabled alu32, located in dir 'no_alu32/'. > > The problem is that invoking a "flavor" binary prints to stdout e.g.: > "Switching to flavor 'no_alu32' subdirectory..." > Thus, intermixing with the number of tests, making it unusable for scripting. > > Fix the issue by only printing "flavor" info when verbose -v option is used. > > Fixes: 643e7233aa94 ("selftests/bpf: Test_progs option for getting number of tests") > Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> Applied. Thanks
diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index b1e4dadacd9b..22943b58d752 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -618,7 +618,9 @@ int cd_flavor_subdir(const char *exec_name) if (!flavor) return 0; flavor++; - fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor); + if (env.verbosity > VERBOSE_NONE) + fprintf(stdout, "Switching to flavor '%s' subdirectory...\n", flavor); + return chdir(flavor); }
Commit 643e7233aa94 ("selftests/bpf: Test_progs option for getting number of tests") introduced ability to getting number of tests, which is targeted towards scripting. As demonstrate in the commit the number can be use as a shell variable for further scripting. The test_progs program support "flavor", which is detected by the binary have a "-flavor" in the executable name. One example is test_progs-no_alu32, which load bpf-progs compiled with disabled alu32, located in dir 'no_alu32/'. The problem is that invoking a "flavor" binary prints to stdout e.g.: "Switching to flavor 'no_alu32' subdirectory..." Thus, intermixing with the number of tests, making it unusable for scripting. Fix the issue by only printing "flavor" info when verbose -v option is used. Fixes: 643e7233aa94 ("selftests/bpf: Test_progs option for getting number of tests") Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com> --- tools/testing/selftests/bpf/test_progs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)