On 08/27/2015 02:10 PM, Shuah Khan wrote: > On 08/14/2015 07:43 AM, Bamvor Jian Zhang wrote: >> When the test cases is not supported by the current architecture >> the install files(TEST_PROGS, TEST_PROGS_EXTENDED and TEST_FILES) >> will be empty. Check it before installation to dismiss a failure >> reported by install program. >> >> Signed-off-by: Bamvor Jian Zhang <bamvor.zhangj...@linaro.org> >> --- >> tools/testing/selftests/Makefile | 1 - >> tools/testing/selftests/lib.mk | 13 ++++++++----- >> 2 files changed, 8 insertions(+), 6 deletions(-) >> >> diff --git a/tools/testing/selftests/Makefile >> b/tools/testing/selftests/Makefile >> index 5f1d643..1d4a29a 100644 >> --- a/tools/testing/selftests/Makefile >> +++ b/tools/testing/selftests/Makefile >> @@ -73,7 +73,6 @@ ifdef INSTALL_PATH >> @# Ask all targets to install their files >> mkdir -p $(INSTALL_PATH) >> for TARGET in $(TARGETS); do \ >> - mkdir -p $(INSTALL_PATH)/$$TARGET ; \ >> make -C $$TARGET INSTALL_PATH=$(INSTALL_PATH)/$$TARGET install; >> \ >> done; >> >> diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk >> index 1acfd02..4e14665 100644 >> --- a/tools/testing/selftests/lib.mk >> +++ b/tools/testing/selftests/lib.mk >> @@ -14,11 +14,14 @@ run_tests: all >> $(RUN_TESTS) >> >> define INSTALL_RULE >> - mkdir -p $(INSTALL_PATH) >> - @for TEST_DIR in $(TEST_DIRS); do\ >> - cp -r $$TEST_DIR $(INSTALL_PATH); \ >> - done; >> - install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) >> $(TEST_FILES) >> + @if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; >> then \ >> + mkdir -p $(INSTALL_PATH); >> \ >> + for TEST_DIR in $(TEST_DIRS); do >> \ >> + cp -r $$TEST_DIR $(INSTALL_PATH); >> \ >> + done; >> \ >> + echo "install -t $(INSTALL_PATH) $(TEST_PROGS) >> $(TEST_PROGS_EXTENDED) $(TEST_FILES)"; \ >> + install -t $(INSTALL_PATH) $(TEST_PROGS) $(TEST_PROGS_EXTENDED) >> $(TEST_FILES); \ >> + fi >> endef >> >> install: all >> > > Hi Bamvor, > > This patch works as intended for tests that use the default > INSTALL_RULE. In the cases where INSTALL_RULE is overridden > as in the case of powerpc, powerpc directory still gets created > during install. > > It would be nice if we can fix it for the override cases as well. > I will get this into 4.3 for now. Would you like to send a patch > to fix the override cases as well?? >
Applied to linux-kselftest next for 4.3-rc1. thanks, -- Shuah -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shua...@osg.samsung.com | (970) 217-8978 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
