Skip to content

Commit

Permalink
Merge tag 'linux-kselftest-4.10-rc4-fixes' of git://git.kernel.org/pu…
Browse files Browse the repository at this point in the history
…b/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
  • Loading branch information
Linus Torvalds committed Jan 10, 2017
2 parents bd5d742 + 7738789 commit 807b93e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/test_kmod.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

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

Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/net/run_netsocktests
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

echo "--------------------"
echo "running socket test"
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/x86/protection_keys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down

0 comments on commit 807b93e

Please sign in to comment.