diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-05 14:57:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-05 14:57:06 -0500 |
| commit | 094b58e1040a44f991d7ab628035e69c4d6b79c9 (patch) | |
| tree | e0cee3d7e8eac592c047bd68785b33aad37d6863 | |
| parent | 547046141f44dba075207fd343e3e032e129c9ac (diff) | |
| parent | ba004a2955f759946d8c98ca1a9c8d09818b1223 (diff) | |
Merge tag 'linux-kselftest-4.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan:
"A fix for regression in memory-hotplug install script that prevents
the test from running on the target"
* tag 'linux-kselftest-4.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: memory-hotplug: fix emit_tests regression
| -rw-r--r-- | tools/testing/selftests/memory-hotplug/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/selftests/memory-hotplug/Makefile b/tools/testing/selftests/memory-hotplug/Makefile index 183b46883875..686da510f989 100644 --- a/tools/testing/selftests/memory-hotplug/Makefile +++ b/tools/testing/selftests/memory-hotplug/Makefile | |||
| @@ -5,7 +5,8 @@ include ../lib.mk | |||
| 5 | 5 | ||
| 6 | TEST_PROGS := mem-on-off-test.sh | 6 | TEST_PROGS := mem-on-off-test.sh |
| 7 | override RUN_TESTS := @./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]" | 7 | override RUN_TESTS := @./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]" |
| 8 | override EMIT_TESTS := echo "$(RUN_TESTS)" | 8 | |
| 9 | override EMIT_TESTS := echo "$(subst @,,$(RUN_TESTS))" | ||
| 9 | 10 | ||
| 10 | run_full_test: | 11 | run_full_test: |
| 11 | @/bin/bash ./mem-on-off-test.sh && echo "memory-hotplug selftests: [PASS]" || echo "memory-hotplug selftests: [FAIL]" | 12 | @/bin/bash ./mem-on-off-test.sh && echo "memory-hotplug selftests: [PASS]" || echo "memory-hotplug selftests: [FAIL]" |