diff mbox

[GIT,PULL] Kselftest update for 4.10-rc4

Message ID 0e119ef7-56ad-d5e4-e25a-fd4c4fd338ab@osg.samsung.com
State New
Headers show

Commit Message

Shuah Khan Jan. 10, 2017, 5:43 p.m. UTC
Hi Linus,

Please pull the Kselftest fixes for 4.10-rc4

This update consists of fixes to use shell instead of bash to run tests
on embedded devices where the only shell available is the busybox ash.
Also included is a typo fix to a test result message.

diff attached.

thanks,
-- Shuah

--------------------------------------------------------------------------
The following changes since commit 7ce7d89f48834cefece7804d38fc5d85382edf77:

  Linux 4.10-rc1 (2016-12-25 16:13:08 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-4.10-rc4-fixes

for you to fetch changes up to 7738789fba09108a28a5fb4739595d9a0a2f85fe:

  selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration" (2017-01-05 13:24:18 -0700)

----------------------------------------------------------------
linux-kselftest-4.10-rc4-fixes

This update consists of fixes to use shell instead of bash to run tests
on embedded devices where the only shell available is the busybox ash.
Also included is a typo fix to a test result message.

----------------------------------------------------------------
Colin King (1):
      selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration"

Rolf Eike Beer (3):
      selftests: do not require bash for the generated test
      selftests: do not require bash to run bpf tests
      selftests: do not require bash to run netsocktests testcase

 tools/testing/selftests/Makefile              | 2 +-
 tools/testing/selftests/bpf/test_kmod.sh      | 2 +-
 tools/testing/selftests/net/run_netsocktests  | 2 +-
 tools/testing/selftests/x86/protection_keys.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--------------------------------------------------------------------------

-- 
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com
diff mbox

Patch

diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 71b0589..831022b 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -90,7 +90,7 @@  ifdef INSTALL_PATH
 	done;
 
 	@# Ask all targets to emit their test scripts
-	echo "#!/bin/bash" > $(ALL_SCRIPT)
+	echo "#!/bin/sh" > $(ALL_SCRIPT)
 	echo "cd \$$(dirname \$$0)" >> $(ALL_SCRIPT)
 	echo "ROOT=\$$PWD" >> $(ALL_SCRIPT)
 
diff --git a/tools/testing/selftests/bpf/test_kmod.sh b/tools/testing/selftests/bpf/test_kmod.sh
index 92e627a..6d58cca 100755
--- a/tools/testing/selftests/bpf/test_kmod.sh
+++ b/tools/testing/selftests/bpf/test_kmod.sh
@@ -1,4 +1,4 @@ 
-#!/bin/bash
+#!/bin/sh
 
 SRC_TREE=../../../../
 
diff --git a/tools/testing/selftests/net/run_netsocktests b/tools/testing/selftests/net/run_netsocktests
index c09a682..16058bb 100755
--- a/tools/testing/selftests/net/run_netsocktests
+++ b/tools/testing/selftests/net/run_netsocktests
@@ -1,4 +1,4 @@ 
-#!/bin/bash
+#!/bin/sh
 
 echo "--------------------"
 echo "running socket test"
diff --git a/tools/testing/selftests/x86/protection_keys.c b/tools/testing/selftests/x86/protection_keys.c
index bdd58c7..df9e0a0 100644
--- a/tools/testing/selftests/x86/protection_keys.c
+++ b/tools/testing/selftests/x86/protection_keys.c
@@ -1367,7 +1367,7 @@  void run_tests_once(void)
 		tracing_off();
 		close_test_fds();
 
-		printf("test %2d PASSED (itertation %d)\n", test_nr, iteration_nr);
+		printf("test %2d PASSED (iteration %d)\n", test_nr, iteration_nr);
 		dprintf1("======================\n\n");
 	}
 	iteration_nr++;