diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-21 13:26:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-21 13:26:00 -0400 |
| commit | 6488ec263343337fdb090b15563864b293ce0340 (patch) | |
| tree | b74899432d279acd39a324f400edf0654d47c84f | |
| parent | 9409227ab202938b730219b30d231a242eab5484 (diff) | |
| parent | 8bf24e8319613bbe950d4188682b3a0d9441b76b (diff) | |
Merge tag 'linux-kselftest-4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fix from Shuah Khan:
"A fix from Michael Ellerman to not run dnotify_test by default to
prevent Kselftest running forever"
* tag 'linux-kselftest-4.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/filesystems: Don't run dnotify_test by default
| -rw-r--r-- | tools/testing/selftests/filesystems/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/testing/selftests/filesystems/Makefile b/tools/testing/selftests/filesystems/Makefile index 4e6d09fb166f..5c7d7001ad37 100644 --- a/tools/testing/selftests/filesystems/Makefile +++ b/tools/testing/selftests/filesystems/Makefile | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | # SPDX-License-Identifier: GPL-2.0 | 1 | # SPDX-License-Identifier: GPL-2.0 |
| 2 | TEST_PROGS := dnotify_test devpts_pts | ||
| 3 | all: $(TEST_PROGS) | ||
| 4 | 2 | ||
| 5 | include ../lib.mk | 3 | TEST_GEN_PROGS := devpts_pts |
| 4 | TEST_GEN_PROGS_EXTENDED := dnotify_test | ||
| 6 | 5 | ||
| 7 | clean: | 6 | include ../lib.mk |
| 8 | rm -fr $(TEST_PROGS) | ||