| Message ID | a2344d4df903d673afe1631118f40917f773cc9a.1415735831.git.shuahkh@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/11/2014 01:27 PM, Shuah Khan wrote: > Add a new make target to install to install kernel selftests. > This new target will build and install selftests. kselftest > target now depends on kselftest_install and runs the generated > kselftest script to reduce duplicate work and for common look > and feel when running tests. > > Approach: > > make kselftest_target: > -- exports kselftest INSTALL_KSFT_PATH > default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) > -- exports path for ksefltest.sh > -- runs selftests make install target: > > selftests make install target > -- creates kselftest.sh script in install install dir > -- runs install targets for all INSTALL_TARGETS > (Note: ftrace and powerpc aren't included in INSTALL_TARGETS, > to not add more content to patch v1 series. This work > will happen soon. In this series these two targets are > run after running the generated kselftest script, without > any regression in the way these tests are run with > "make kselftest" prior to this work.) > -- install target can be run only from top level source dir. > > Individual test make install targets: > -- install test programs and/or scripts in install dir > -- append to the ksefltest.sh file to add commands to run test > -- install target can be run only from top level source dir. > > Adds the following new ways to initiate selftests: > -- Installing and running kselftest from install directory > by running "make kselftest" > -- Running kselftest script from install directory > > Maintains the following ways to run tests: > -- make -C tools/testing/selftests run_tests > -- make -C tools/testing/selftests TARGETS=target run_tests > Ability specify targets: e.g TARGETS=net > -- make run_tests from tools/testing/selftests > -- make run_tests from individual test directories: > e.g: make run_tests in tools/testing/selftests/breakpoints > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > --- > Makefile | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) Hi Marek, Did you get a chance to take a look at this patch? -- Shuah
(2014/11/12 5:27), Shuah Khan wrote: > Add a new make target to install to install kernel selftests. > This new target will build and install selftests. kselftest > target now depends on kselftest_install and runs the generated > kselftest script to reduce duplicate work and for common look > and feel when running tests. > > Approach: > > make kselftest_target: kselftest_install? > -- exports kselftest INSTALL_KSFT_PATH > default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) > -- exports path for ksefltest.sh > -- runs selftests make install target: This direction is OK to me. BTW, I've found another path to make selftest in Makefile, Actually you can do make -C tools/ selftest And there are selftest_install and selftest_clean targets (but currently it has a bug and doesn't work, anyway) I think we'd better do subdir make instead of adding these targets. This means that "make kselftest*" should be an alias of "make -C tools/ selftest*" Also, I'd like to request passing some options like as O=$(objtree) so that we can make test kmodules in selftests. Thank you,
On 2014-11-11 21:27, Shuah Khan wrote: > Add a new make target to install to install kernel selftests. > This new target will build and install selftests. kselftest > target now depends on kselftest_install and runs the generated > kselftest script to reduce duplicate work and for common look > and feel when running tests. > > Approach: > > make kselftest_target: > -- exports kselftest INSTALL_KSFT_PATH > default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) > -- exports path for ksefltest.sh > -- runs selftests make install target: > > selftests make install target > -- creates kselftest.sh script in install install dir > -- runs install targets for all INSTALL_TARGETS > (Note: ftrace and powerpc aren't included in INSTALL_TARGETS, > to not add more content to patch v1 series. This work > will happen soon. In this series these two targets are > run after running the generated kselftest script, without > any regression in the way these tests are run with > "make kselftest" prior to this work.) > -- install target can be run only from top level source dir. > > Individual test make install targets: > -- install test programs and/or scripts in install dir > -- append to the ksefltest.sh file to add commands to run test > -- install target can be run only from top level source dir. > > Adds the following new ways to initiate selftests: > -- Installing and running kselftest from install directory > by running "make kselftest" > -- Running kselftest script from install directory > > Maintains the following ways to run tests: > -- make -C tools/testing/selftests run_tests > -- make -C tools/testing/selftests TARGETS=target run_tests > Ability specify targets: e.g TARGETS=net > -- make run_tests from tools/testing/selftests > -- make run_tests from individual test directories: > e.g: make run_tests in tools/testing/selftests/breakpoints > > Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> > --- > Makefile | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 05d67af..ccbd2e1 100644 > --- a/Makefile > +++ b/Makefile > @@ -1071,12 +1071,26 @@ headers_check: headers_install > $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 > > # --------------------------------------------------------------------------- > -# Kernel selftest > +# Kernel selftest targets > + > +PHONY += __kselftest_configure > +INSTALL_KSFT_PATH=$(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) > +export INSTALL_KSFT_PATH > +KSELFTEST=$(INSTALL_KSFT_PATH)/kselftest.sh > +export KSELFTEST Can this be moved to tools/testing/selftests/Makefile? It's only used in this part of the tree. > PHONY += kselftest > -kselftest: > +kselftest: kselftest_install > $(Q)$(MAKE) -C tools/testing/selftests run_tests > > +# Kernel selftest install > + > +PHONY += kselftest_install > +kselftest_install: __kselftest_configure > + @rm -rf $(INSTALL_KSFT_PATH) > + @mkdir -p $(INSTALL_KSFT_PATH) Please use $(Q) insteaf od hardcoding the @. > + $(Q)$(MAKE) -C tools/testing/selftests install The install target is only added by the next patch, which in turn depends on changes done by later patches. The order (in the current numbering) should be 01/19, 04/19, ... 19/19, 03/19 and 02/19. Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11/26/2014 10:32 PM, Masami Hiramatsu wrote: > (2014/11/12 5:27), Shuah Khan wrote: >> Add a new make target to install to install kernel selftests. >> This new target will build and install selftests. kselftest >> target now depends on kselftest_install and runs the generated >> kselftest script to reduce duplicate work and for common look >> and feel when running tests. >> >> Approach: >> >> make kselftest_target: > > kselftest_install? Thanks for catching this. Will fix it. > >> -- exports kselftest INSTALL_KSFT_PATH >> default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) >> -- exports path for ksefltest.sh >> -- runs selftests make install target: > > This direction is OK to me. > > BTW, I've found another path to make selftest in Makefile, > Actually you can do > > make -C tools/ selftest > > And there are selftest_install and selftest_clean targets (but > currently it has a bug and doesn't work, anyway) Thanks for pointing this out. I didn't know this existed. kind of hidden. > > I think we'd better do subdir make instead of adding these targets. > This means that "make kselftest*" should be an alias of "make -C tools/ selftest*" > Yes that would be a good way to go and helps leverage these options at tools/Makefile level. > Also, I'd like to request passing some options like as O=$(objtree) > so that we can make test kmodules in selftests. Sounds good. I will look into it. thanks, -- Shuah
On 12/01/2014 08:47 AM, Michal Marek wrote: > On 2014-11-11 21:27, Shuah Khan wrote: >> Add a new make target to install to install kernel selftests. >> This new target will build and install selftests. kselftest >> target now depends on kselftest_install and runs the generated >> kselftest script to reduce duplicate work and for common look >> and feel when running tests. >> >> Approach: >> >> make kselftest_target: >> -- exports kselftest INSTALL_KSFT_PATH >> default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) >> -- exports path for ksefltest.sh >> -- runs selftests make install target: >> >> selftests make install target >> -- creates kselftest.sh script in install install dir >> -- runs install targets for all INSTALL_TARGETS >> (Note: ftrace and powerpc aren't included in INSTALL_TARGETS, >> to not add more content to patch v1 series. This work >> will happen soon. In this series these two targets are >> run after running the generated kselftest script, without >> any regression in the way these tests are run with >> "make kselftest" prior to this work.) >> -- install target can be run only from top level source dir. >> >> Individual test make install targets: >> -- install test programs and/or scripts in install dir >> -- append to the ksefltest.sh file to add commands to run test >> -- install target can be run only from top level source dir. >> >> Adds the following new ways to initiate selftests: >> -- Installing and running kselftest from install directory >> by running "make kselftest" >> -- Running kselftest script from install directory >> >> Maintains the following ways to run tests: >> -- make -C tools/testing/selftests run_tests >> -- make -C tools/testing/selftests TARGETS=target run_tests >> Ability specify targets: e.g TARGETS=net >> -- make run_tests from tools/testing/selftests >> -- make run_tests from individual test directories: >> e.g: make run_tests in tools/testing/selftests/breakpoints >> >> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> >> --- >> Makefile | 21 +++++++++++++++++++-- >> 1 file changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 05d67af..ccbd2e1 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -1071,12 +1071,26 @@ headers_check: headers_install >> $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 >> >> # --------------------------------------------------------------------------- >> -# Kernel selftest >> +# Kernel selftest targets >> + >> +PHONY += __kselftest_configure >> +INSTALL_KSFT_PATH=$(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) >> +export INSTALL_KSFT_PATH >> +KSELFTEST=$(INSTALL_KSFT_PATH)/kselftest.sh >> +export KSELFTEST > > Can this be moved to tools/testing/selftests/Makefile? It's only used in > this part of the tree. I looked into doing that. KERNELRELEASE will have to be exported for tools/testing/selftests/Makefile to use it? Does that sound okay? > > >> PHONY += kselftest >> -kselftest: >> +kselftest: kselftest_install >> $(Q)$(MAKE) -C tools/testing/selftests run_tests >> >> +# Kernel selftest install >> + >> +PHONY += kselftest_install >> +kselftest_install: __kselftest_configure >> + @rm -rf $(INSTALL_KSFT_PATH) >> + @mkdir -p $(INSTALL_KSFT_PATH) > > Please use $(Q) insteaf od hardcoding the @. I can do that. > > >> + $(Q)$(MAKE) -C tools/testing/selftests install > > The install target is only added by the next patch, which in turn > depends on changes done by later patches. The order (in the current > numbering) should be 01/19, 04/19, ... 19/19, 03/19 and 02/19. > Right. I can re-order the patches in my next version and make other changes you recommended. Also, it might be easier to get this series in, if you can Ack the main Makefile patch (when we are ready i.e), so I can take it through kselftest tree. thanks, -- Shuah
On 2014-12-01 17:39, Shuah Khan wrote: > On 12/01/2014 08:47 AM, Michal Marek wrote: >> On 2014-11-11 21:27, Shuah Khan wrote: >>> diff --git a/Makefile b/Makefile >>> index 05d67af..ccbd2e1 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -1071,12 +1071,26 @@ headers_check: headers_install >>> $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 >>> >>> # --------------------------------------------------------------------------- >>> -# Kernel selftest >>> +# Kernel selftest targets >>> + >>> +PHONY += __kselftest_configure >>> +INSTALL_KSFT_PATH=$(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) >>> +export INSTALL_KSFT_PATH >>> +KSELFTEST=$(INSTALL_KSFT_PATH)/kselftest.sh >>> +export KSELFTEST >> >> Can this be moved to tools/testing/selftests/Makefile? It's only used in >> this part of the tree. > > I looked into doing that. KERNELRELEASE will have to be exported for > tools/testing/selftests/Makefile to use it? Does that sound okay? In fact, KERNELRELEASE is already exported. So go ahead. > Also, it might be easier to get this series in, if you can Ack the main > Makefile patch (when we are ready i.e), so I can take it through > kselftest tree. Sure. The Makefile change will only consist of redirecting the kselftest_install target to tools/testing/selftests, right? Michal -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/03/2014 05:09 AM, Michal Marek wrote: > On 2014-12-01 17:39, Shuah Khan wrote: >> On 12/01/2014 08:47 AM, Michal Marek wrote: >>> On 2014-11-11 21:27, Shuah Khan wrote: >>>> diff --git a/Makefile b/Makefile >>>> index 05d67af..ccbd2e1 100644 >>>> --- a/Makefile >>>> +++ b/Makefile >>>> @@ -1071,12 +1071,26 @@ headers_check: headers_install >>>> $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 >>>> >>>> # --------------------------------------------------------------------------- >>>> -# Kernel selftest >>>> +# Kernel selftest targets >>>> + >>>> +PHONY += __kselftest_configure >>>> +INSTALL_KSFT_PATH=$(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) >>>> +export INSTALL_KSFT_PATH >>>> +KSELFTEST=$(INSTALL_KSFT_PATH)/kselftest.sh >>>> +export KSELFTEST >>> >>> Can this be moved to tools/testing/selftests/Makefile? It's only used in >>> this part of the tree. >> >> I looked into doing that. KERNELRELEASE will have to be exported for >> tools/testing/selftests/Makefile to use it? Does that sound okay? > > In fact, KERNELRELEASE is already exported. So go ahead. Good. > > >> Also, it might be easier to get this series in, if you can Ack the main >> Makefile patch (when we are ready i.e), so I can take it through >> kselftest tree. > > Sure. The Makefile change will only consist of redirecting the > kselftest_install target to tools/testing/selftests, right? > Correct. I plan to keep the selftests specific work under the selftests related Makefiles. thanks, -- Shuah
diff --git a/Makefile b/Makefile index 05d67af..ccbd2e1 100644 --- a/Makefile +++ b/Makefile @@ -1071,12 +1071,26 @@ headers_check: headers_install $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi/asm $(hdr-dst) HDRCHECK=1 # --------------------------------------------------------------------------- -# Kernel selftest +# Kernel selftest targets + +PHONY += __kselftest_configure +INSTALL_KSFT_PATH=$(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) +export INSTALL_KSFT_PATH +KSELFTEST=$(INSTALL_KSFT_PATH)/kselftest.sh +export KSELFTEST PHONY += kselftest -kselftest: +kselftest: kselftest_install $(Q)$(MAKE) -C tools/testing/selftests run_tests +# Kernel selftest install + +PHONY += kselftest_install +kselftest_install: __kselftest_configure + @rm -rf $(INSTALL_KSFT_PATH) + @mkdir -p $(INSTALL_KSFT_PATH) + $(Q)$(MAKE) -C tools/testing/selftests install + # --------------------------------------------------------------------------- # Modules @@ -1285,6 +1299,9 @@ help: @echo ' Build, install, and boot kernel before' @echo ' running kselftest on it' @echo '' + @echo ' kselftest_install - Install Kselftests to INSTALL_KSFT_PATH' + @echo ' default: $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE)' + @echo '' @echo 'Kernel packaging:' @$(MAKE) $(build)=$(package-dir) help @echo ''
Add a new make target to install to install kernel selftests. This new target will build and install selftests. kselftest target now depends on kselftest_install and runs the generated kselftest script to reduce duplicate work and for common look and feel when running tests. Approach: make kselftest_target: -- exports kselftest INSTALL_KSFT_PATH default $(INSTALL_MOD_PATH)/lib/kselftest/$(KERNELRELEASE) -- exports path for ksefltest.sh -- runs selftests make install target: selftests make install target -- creates kselftest.sh script in install install dir -- runs install targets for all INSTALL_TARGETS (Note: ftrace and powerpc aren't included in INSTALL_TARGETS, to not add more content to patch v1 series. This work will happen soon. In this series these two targets are run after running the generated kselftest script, without any regression in the way these tests are run with "make kselftest" prior to this work.) -- install target can be run only from top level source dir. Individual test make install targets: -- install test programs and/or scripts in install dir -- append to the ksefltest.sh file to add commands to run test -- install target can be run only from top level source dir. Adds the following new ways to initiate selftests: -- Installing and running kselftest from install directory by running "make kselftest" -- Running kselftest script from install directory Maintains the following ways to run tests: -- make -C tools/testing/selftests run_tests -- make -C tools/testing/selftests TARGETS=target run_tests Ability specify targets: e.g TARGETS=net -- make run_tests from tools/testing/selftests -- make run_tests from individual test directories: e.g: make run_tests in tools/testing/selftests/breakpoints Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> --- Makefile | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-)