Merge tag 'linux-kselftest-4.10-rc4-fixes' of... (807b93e9) · Commits · 戴 / test

Merge tag 'linux-kselftest-4.10-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest Pull kselftest fixes from Shuah Khan: "This update consists of fixes to use shell instead of bash to run tests in embedded devices where the only shell available is the busybox ash. Also included is a typo fix to a test result message" * tag 'linux-kselftest-4.10-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration" selftests: do not require bash to run netsocktests testcase selftests: do not require bash to run bpf tests selftests: do not require bash for the generated test

tools/testing/selftests/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

tools/testing/selftests/bpf/test_kmod.sh

+1 −1

Original line number	Diff line number	Diff line
		#!/bin/bash
		#!/bin/sh

		SRC_TREE=../../../../

tools/testing/selftests/net/run_netsocktests

+1 −1

Original line number	Diff line number	Diff line
		#!/bin/bash
		#!/bin/sh

		echo "--------------------"
		echo "running socket test"

tools/testing/selftests/x86/protection_keys.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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++;

Admin message