diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-26 10:06:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-26 10:06:56 -0800 |
| commit | 2fcc74178f6dc06ecffcd1f601ca3a3e87b3012c (patch) | |
| tree | 708049263a646f12b540fd8a3cf627e11fc0d3d8 /tools/testing/selftests/net | |
| parent | Revert "KVM: x86: enable -Werror" (diff) | |
| parent | selftests/rseq: Fix out-of-tree compilation (diff) | |
| download | linux-dev-2fcc74178f6dc06ecffcd1f601ca3a3e87b3012c.tar.xz linux-dev-2fcc74178f6dc06ecffcd1f601ca3a3e87b3012c.zip | |
Merge tag 'linux-kselftest-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan:
- fixes to TIMEOUT failures and out-of-tree compilation compilation
errors from Michael Ellerman.
- declutter git status fix from Christophe Leroy
* tag 'linux-kselftest-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/rseq: Fix out-of-tree compilation
selftests: Install settings files to fix TIMEOUT failures
selftest/lkdtm: Don't pollute 'git status'
Diffstat (limited to 'tools/testing/selftests/net')
| -rw-r--r-- | tools/testing/selftests/net/mptcp/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile index 93de52016dde..ba450e62dc5b 100644 --- a/tools/testing/selftests/net/mptcp/Makefile +++ b/tools/testing/selftests/net/mptcp/Makefile @@ -8,6 +8,8 @@ TEST_PROGS := mptcp_connect.sh TEST_GEN_FILES = mptcp_connect +TEST_FILES := settings + EXTRA_CLEAN := *.pcap include ../../lib.mk |