Skip to content

Commit

Permalink
Merge tag 'linux-kselftest-4.16-rc5' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
Linus Torvalds committed Mar 5, 2018
2 parents 5470461 + ba004a2 commit 094b58e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tools/testing/selftests/memory-hotplug/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ include ../lib.mk

TEST_PROGS := mem-on-off-test.sh
override RUN_TESTS := @./mem-on-off-test.sh -r 2 && echo "selftests: memory-hotplug [PASS]" || echo "selftests: memory-hotplug [FAIL]"
override EMIT_TESTS := echo "$(RUN_TESTS)"

override EMIT_TESTS := echo "$(subst @,,$(RUN_TESTS))"

run_full_test:
@/bin/bash ./mem-on-off-test.sh && echo "memory-hotplug selftests: [PASS]" || echo "memory-hotplug selftests: [FAIL]"
Expand Down

0 comments on commit 094b58e

Please sign in to comment.