Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

tools/testing/selftests/futex/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ all: 
	done



override define RUN_TESTS

	@if [ `dirname $(OUTPUT)` = $(PWD) ]; then ./run.sh; fi

	$(OUTPUT)/run.sh

endef



override define INSTALL_RULE

tools/testing/selftests/kmod/kmod.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

tools/testing/selftests/sysctl/sysctl.sh

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

tools/testing/selftests/timers/freq-step.c

+3 −4
Original line number Diff line number Diff line
@@ -229,10 +229,9 @@ static void init_test(void) 
	printf("CLOCK_MONOTONIC_RAW+CLOCK_MONOTONIC precision: %.0f ns\t\t",

	       1e9 * precision);



	if (precision > MAX_PRECISION) {

		printf("[SKIP]\n");

		ksft_exit_skip();

	}

	if (precision > MAX_PRECISION)

		ksft_exit_skip("precision: %.0f ns > MAX_PRECISION: %.0f ns\n",

				1e9 * precision, 1e9 * MAX_PRECISION);



	printf("[OK]\n");

	srand(ts.tv_sec ^ ts.tv_nsec);