Commit 40c6d1b9 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-4.13-rc6-fixes' of...

Merge tag 'linux-kselftest-4.13-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "This update consists of important compile and run-time error fixes to
  timers/freq-step, kmod, and sysctl tests"

* tag 'linux-kselftest-4.13-rc6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: timers: freq-step: fix compile error
  selftests: futex: fix run_tests target
  test_sysctl: fix sysctl.sh by making it executable
  test_kmod: fix kmod.sh by making it executable
parents fcd07350 622b2fbe
...@@ -14,7 +14,7 @@ all: ...@@ -14,7 +14,7 @@ all:
done done
override define RUN_TESTS override define RUN_TESTS
@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi $(OUTPUT)/run.sh
endef endef
override define INSTALL_RULE override define INSTALL_RULE
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
...@@ -229,10 +229,9 @@ static void init_test(void) ...@@ -229,10 +229,9 @@ static void init_test(void)
printf("CLOCK_MONOTONIC_RAW+CLOCK_MONOTONIC precision: %.0f ns\t\t", printf("CLOCK_MONOTONIC_RAW+CLOCK_MONOTONIC precision: %.0f ns\t\t",
1e9 * precision); 1e9 * precision);
if (precision > MAX_PRECISION) { if (precision > MAX_PRECISION)
printf("[SKIP]\n"); ksft_exit_skip("precision: %.0f ns > MAX_PRECISION: %.0f ns\n",
ksft_exit_skip(); 1e9 * precision, 1e9 * MAX_PRECISION);
}
printf("[OK]\n"); printf("[OK]\n");
srand(ts.tv_sec ^ ts.tv_nsec); srand(ts.tv_sec ^ ts.tv_nsec);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment