Changes to timers Maefile to use shared logic for run_tests and install
Subsystems (4)
cover Changes to timers Maefile to use shared logic for run_tests and install
This patch set:
adds ability to run and emit script for tests args to lib.mk. lib.mk provides a way to override the default RUN_TESTS and EMIT_TESTS, however in the cases where a test has several executables that don't require any special args and/or handling and some that do, overrding will be cumbersome. Add variables RUN_TESTS_WITH_ARGS, and EMIT_TESTS_WITH_ARGS to enable a test to run and exmit script for such special executables.
Timers test Makefile is changed to use the shared logic for running and installing tests.
Shuah Khan (2):
selftests: add ability to run and emit script for tests args to lib.mk selftests/timers: change to use shared logic to run and install tests
tools/testing/selftests/lib.mk | 6 ++++++ tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/2 selftests: add ability to run and emit script for tests args to lib.mk
Add ability to run, emit, install tests take arguments to the shared logic in lib.mk. lib.mk provides a way to override the default RUN_TESTS and EMIT_TESTS, however in the cases where a test has several executables that don't require any special args and/or handling and some that do, overrding will be cumbersome. Add variables RUN_TESTS_WITH_ARGS, and EMIT_TESTS_WITH_ARGS to enable a test to run and exmit script for such special executables.
--- tools/testing/selftests/lib.mk | 6 ++++++ 1 file changed, 6 insertions(+)
tools/testing/selftests/lib.mk +6 -0
@@ -6,6 +6,9 @@ endef run_tests: all $(RUN_TESTS) +ifdef RUN_TESTS_WITH_ARGS + $(RUN_TESTS_WITH_ARGS) +endif define INSTALL_RULE mkdir -p $(INSTALL_PATH)
@@ -27,5 +30,8 @@ endef emit_tests: $(EMIT_TESTS) +ifdef EMIT_TESTS_WITH_ARGS + $(EMIT_TESTS_WITH_ARGS) +endif .PHONY: run_tests all clean install emit_tests
Signature · 1 line
2.1.0
PATCH 2/2 selftests/timers: change to use shared logic to run and install tests
In reply to Shuah KhanChange the timers Makefile to make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited to run_kselftest script to match the run_tests behavior.
--- tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
tools/testing/selftests/timers/Makefile +11 -9
@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038 +TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +EMIT_TESTS_WITH_ARGS := echo "$(RUN_TESTS_WITH_ARGS)" + all: ${bins} # these are all "safe" tests that don't modify # system time or require escalated privledges -run_tests: all - ./posix_timers - ./nanosleep - ./nsleep-lat - ./set-timer-lat - ./mqueue-lat - ./inconsistency-check - ./raw_skew - ./threadtest -t 30 -n 8 +include ../lib.mk # these tests require escalated privledges # and may modify the system time or trigger
Signature · 1 line
2.1.0
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
Quoted 17 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>--- tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +0
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038
tools/testing/selftests/timers/Makefile bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ · line 19
Quoted 10 lines
tools/testing/selftests/timers/Makefile +10
-0+TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +EMIT_TESTS_WITH_ARGS := echo "$(RUN_TESTS_WITH_ARGS)" +
So my make-foo isn't very strong, but no objections from me.
My only thoughts:
1) Would it be better if threadtest can be made to have better defaults for kselftest so you don't need that extra logic?
2) While I get that TEST_FILES is likely going to be used to copy the destructive tests over, It feels a little like its being bundled in with something like data files that tests might need, which seems sort of hackish. Would TEST_PROGS_EXTENDED or something be more clear and make more sense?
thanks
-john
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
Quoted 31 lines · John Stultz
Quoted 17 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>--- tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +0
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038tools/testing/selftests/timers/Makefile bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ · line 19
Quoted 10 lines
tools/testing/selftests/timers/Makefile +10
-0+TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +EMIT_TESTS_WITH_ARGS := echo "$(RUN_TESTS_WITH_ARGS)" +So my make-foo isn't very strong, but no objections from me.
Quoted 3 lines
My only thoughts:
1) Would it be better if threadtest can be made to have better defaults for kselftest so you don't need that extra logic?
That would help. But with the patch I just sent I think it's no bother, it's only a little extra logic and it's only in the timers Makefile.
Quoted 5 lines
2) While I get that
TEST_FILESis likely going to be used to copy the destructive tests over, It feels a little like its being bundled in with something like data files that tests might need, which seems sort of hackish. WouldTEST_PROGS_EXTENDEDor something be more clear and make more sense?
That doesn't really bother me. You're right that TEST_FILES is originally intended for data files etc. but I don't think it's a big hack to use it for other tests that shouldn't be run by default. Still if it bothers you I'm happy to add a separate variable for it, they are cheap :)
cheers
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
Quoted 32 lines · Michael Ellerman
Quoted 31 lines · John Stultz
Quoted 17 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>--- tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +0
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038tools/testing/selftests/timers/Makefile bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ · line 19
Quoted 10 lines
tools/testing/selftests/timers/Makefile +10
-0+TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +EMIT_TESTS_WITH_ARGS := echo "$(RUN_TESTS_WITH_ARGS)" +So my make-foo isn't very strong, but no objections from me.
Quoted 6 lines
Quoted 3 lines
My only thoughts:
1) Would it be better if threadtest can be made to have better defaults for kselftest so you don't need that extra logic?That would help. But with the patch I just sent I think it's no bother, it's only a little extra logic and it's only in the timers
Makefile.
Let's go with a threadtest patch with better defaults. It will emit scripts logic as well. Awesome. I just saw John's new patch in my Inbox. Thanks.
Quoted 7 lines
Quoted 6 lines
2) While I get that
TEST_FILESis likely going to be used to copy the destructive tests over, It feels a little like its being bundled in with something like data files that tests might need, which seems sort of hackish. WouldTEST_PROGS_EXTENDEDor something be more clear and make more sense?
Quoted 5 lines
That doesn't really bother me. You're right that
TEST_FILESis originally intended for data files etc. but I don't think it's a big hack to use it for other tests that shouldn't be run by default. Still if it bothers you I'm happy to add a separate variable for it, they are cheap :)
Michael,
Could you please make the change from TEST_FILES to TEST_PROGS_EXTENDED which is definitely better than overloading TEST_FILES?
I think this would probably only change Add Install target patch. You can send me patch v5 with that change and I will override the next with your new one. Thanks for doing this.
thanks,
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
Quoted 6 lines · Shuah Khan
Quoted 5 lines · Michael Ellerman
Quoted 3 lines · John Stultz
My only thoughts:
1) Would it be better if threadtest can be made to have better defaults for kselftest so you don't need that extra logic?
Quoted 6 lines
Quoted 2 lines
That would help. But with the patch I just sent I think it's no bother, it's only a little extra logic and it's only in the timers
Makefile.Let's go with a threadtest patch with better defaults. It will emit scripts logic as well. Awesome. I just saw John's new patch in my Inbox. Thanks.
Fine by me.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
2) While I get that
TEST_FILESis likely going to be used to copy the destructive tests over, It feels a little like its being bundled in with something like data files that tests might need, which seems sort of hackish. WouldTEST_PROGS_EXTENDEDor something be more clear and make more sense?
Quoted 7 lines
Quoted 4 lines
That doesn't really bother me. You're right that
TEST_FILESis originally intended for data files etc. but I don't think it's a big hack to use it for other tests that shouldn't be run by default. Still if it bothers you I'm happy to add a separate variable for it, they are cheap :)Could you please make the change from
TEST_FILEStoTEST_PROGS_EXTENDEDwhich is definitely better than overloadingTEST_FILES?
I don't see the point, but I don't care that much.
Quoted 3 lines
I think this would probably only change Add Install target patch. You can send me patch v5 with that change and I will override the next with your new one. Thanks for doing this.
You shouldn't rebase your next branch, people may have already merged it (like me). You should apply it as an additional patch on top.
Patch sent.
cheers
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
In reply to John StultzQuoted 31 lines · John Stultz
Quoted 17 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>--- tools/testing/selftests/timers/Makefile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +0
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038tools/testing/selftests/timers/Makefile bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ · line 19
Quoted 10 lines
tools/testing/selftests/timers/Makefile +10
-0+TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +EMIT_TESTS_WITH_ARGS := echo "$(RUN_TESTS_WITH_ARGS)" +So my make-foo isn't very strong, but no objections from me.
Quoted 3 lines
My only thoughts:
1) Would it be better if threadtest can be made to have better defaults for kselftest so you don't need that extra logic?
Yes. If you can change the threadset to run with -t 30 -n 8 in default case, that would make the logic simpler. Can you send me a patch to do this?
Quoted 5 lines
2) While I get that
TEST_FILESis likely going to be used to copy the destructive tests over, It feels a little like its being bundled in with something like data files that tests might need, which seems sort of hackish. WouldTEST_PROGS_EXTENDEDor something be more clear and make more sense?
I agree with you on this. TEST_FILES usage is an overload.
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
In reply to Shuah KhanQuoted 28 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>---
tools/testing/selftests/timers/Makefile| 20 +++++++++++---------1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +7
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038 +TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests:
Quoted 1 line
threadtest [FAIL]"
You shouldn't need this separate variable. As long as you override RUN_TESTS after you include lib.mk you can include the default value, eg:
override RUN_TESTS := $(RUN_TESTS) ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]"
I'll test that in the morning and send a proper patch.
cheers
Signature · 1 line
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
Re: [PATCH 2/2] selftests/timers: change to use shared logic to run and install tests
Quoted 34 lines · Michael Ellerman
Quoted 28 lines · Shuah Khan
Change the timers
Makefileto make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited torun_kselftestscript to match therun_testsbehavior.Signed-off-by Shuah Khan <[email protected]>---
tools/testing/selftests/timers/Makefile| 20 +++++++++++---------1 file changed, 11 insertions(+), 9 deletions(-)tools/testing/selftests/timers/Makefile +7
-0@@ -7,19 +7,21 @@ bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ alarmtimer-suspend change_skew skew_consistency clocksource-switch \ leap-a-day leapcrash set-tai set-2038 +TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +RUN_TESTS_WITH_ARGS := ./threadtest -t 30 -n 8 || echo "selftests:Quoted 1 line
threadtest [FAIL]"
You shouldn't need this separate variable. As long as you override
RUN_TESTSafter you include lib.mk you can include the default value, eg:
Quoted 3 lines
override
RUN_TESTS:= $(RUN_TESTS) ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]"I'll test that in the morning and send a proper patch.
How's this look?
Contents of install/timers (same as with your patch):
$ ls install/timers/ alarmtimer-suspend* clocksource-switch* leap-a-day* mqueue-lat* nsleep-lat* raw_skew* set-tai* skew_consistency* valid-adjtimex* change_skew* inconsistency-check* leapcrash* nanosleep* posix_timers* set-2038* set-timer-lat* threadtest*
And in run_kselftest.sh:
echo ; echo Running tests in timers
echo ========================================
cd timers
(./posix_timers && echo "selftests: posix_timers [PASS]") || echo "selftests: posix_timers [FAIL]" (./nanosleep && echo "selftests: nanosleep [PASS]") || echo "selftests: nanosleep [FAIL]" (./nsleep-lat && echo "selftests: nsleep-lat [PASS]") || echo "selftests: nsleep-lat [FAIL]" (./set-timer-lat && echo "selftests: set-timer-lat [PASS]") || echo "selftests: set-timer-lat [FAIL]" (./mqueue-lat && echo "selftests: mqueue-lat [PASS]") || echo "selftests: mqueue-lat [FAIL]" (./inconsistency-check && echo "selftests: inconsistency-check [PASS]") || echo "selftests: inconsistency-check [FAIL]" (./raw_skew && echo "selftests: raw_skew [PASS]") || echo "selftests: raw_skew [FAIL]"
./threadtest -t 30 -n 8 || echo selftests: threadtest [FAIL]
cd $ROOT
cheers
Quoted 1 line
From
5ea5ea0e5adee5317978965acc4594dce648da63Mon Sep 17 00:00:00 2001
From: Michael Ellerman <mpe-Gsx/[email protected]>
Date: Mon, 16 Mar 2015 13:38:06 +1100
Subject: [PATCH] selftests/timers: Use shared logic to run and install tests
Change the timers Makefile to make use of shared run and install logic in lib.mk. Destructive tests are installed. Regular tests are emited to run_kselftest script to match the run_tests behavior.
--- tools/testing/selftests/timers/Makefile | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-)
tools/testing/selftests/timers/Makefile +17 -16
@@ -1,25 +1,26 @@ -CC = $(CROSS_COMPILE)gcc BUILD_FLAGS = -DKTEST CFLAGS += -O3 -Wl,-no-as-needed -Wall $(BUILD_FLAGS) LDFLAGS += -lrt -lpthread -bins = posix_timers nanosleep inconsistency-check nsleep-lat raw_skew \ - set-timer-lat threadtest mqueue-lat valid-adjtimex \ - alarmtimer-suspend change_skew skew_consistency clocksource-switch \ - leap-a-day leapcrash set-tai set-2038 - -all: ${bins} # these are all "safe" tests that don't modify # system time or require escalated privledges -run_tests: all - ./posix_timers - ./nanosleep - ./nsleep-lat - ./set-timer-lat - ./mqueue-lat - ./inconsistency-check - ./raw_skew - ./threadtest -t 30 -n 8 +TEST_PROGS = posix_timers nanosleep nsleep-lat set-timer-lat mqueue-lat \ + inconsistency-check raw_skew + +TEST_FILES = threadtest alarmtimer-suspend valid-adjtimex change_skew \ + skew_consistency clocksource-switch leap-a-day leapcrash \ + set-tai set-2038 + +bins = $(TEST_PROGS) $(TEST_FILES) + +all: ${bins} + +include ../lib.mk + +THREADTEST := ./threadtest -t 30 -n 8 || echo "selftests: threadtest [FAIL]" + +override RUN_TESTS := $(RUN_TESTS) $(THREADTEST) +override EMIT_TESTS := $(EMIT_TESTS) echo "$(THREADTEST)" # these tests require escalated privledges # and may modify the system time or trigger
Signature · 1 line
2.1.0