diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
| commit | c13cac2a21b44c6d18a2cf5485f26eee0fb686f6 (patch) | |
| tree | 1cf120a57dbbc95a2d450f1c2047e89b9f917596 /tools/testing/selftests/ftrace | |
| parent | bb8865f435d81223596f1abd6dec0b12ed122af0 (diff) | |
| parent | 98d54f81e36ba3bf92172791eba5ca5bd813989b (diff) | |
Merge tag 'v5.6-rc4' into rdma.git for-next
Required due to dependencies in following patches.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'tools/testing/selftests/ftrace')
| -rw-r--r-- | tools/testing/selftests/ftrace/Makefile | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tools/testing/selftests/ftrace/Makefile b/tools/testing/selftests/ftrace/Makefile index cd1f5b3a7774..d6e106fbce11 100644 --- a/tools/testing/selftests/ftrace/Makefile +++ b/tools/testing/selftests/ftrace/Makefile @@ -2,7 +2,7 @@ all: TEST_PROGS := ftracetest -TEST_FILES := test.d +TEST_FILES := test.d settings EXTRA_CLEAN := $(OUTPUT)/logs/* include ../lib.mk diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc index 64cfcc75e3c1..f2ee1e889e13 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc @@ -1,6 +1,7 @@ #!/bin/sh # SPDX-License-Identifier: GPL-2.0 # description: ftrace - function pid filters +# flags: instance # Make sure that function pid matching filter works. # Also test it on an instance directory @@ -96,13 +97,6 @@ do_test() { } do_test - -mkdir instances/foo -cd instances/foo -do_test -cd ../../ -rmdir instances/foo - do_reset exit 0 |