All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
To: linux-kselftest@vger.kernel.org
Cc: jbenc@redhat.com, Shuah Khan <shuah@kernel.org>, bpf@vger.kernel.org
Subject: [RESEND PATCH 3/3] selftests: simplify run_tests
Date: Wed, 27 May 2020 10:16:59 +0300	[thread overview]
Message-ID: <20200527071659.63426-3-yauheni.kaliuta@redhat.com> (raw)
In-Reply-To: <20200527071659.63426-1-yauheni.kaliuta@redhat.com>

Remove redundant check for TEST_PROGS and use the same command for
in- and out-of-source builds, and

fix bug with adding $(OUTPUT)/ to first $(TEST_PROGS) element only:

1) use $(addprefix ...) function to add $(OUTPUT). In case of blank
$(TEST_PROGS) it will be expanded to blank, so no need for extra
check;

2) $(OUTPUT) is always initialized to current dir or supplied value,
so it does not make any harm to add it unconditionally.

Signed-off-by: Yauheni Kaliuta <yauheni.kaliuta@redhat.com>
---
 tools/testing/selftests/lib.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk
index 7a17ea815736..fac4f7de37fb 100644
--- a/tools/testing/selftests/lib.mk
+++ b/tools/testing/selftests/lib.mk
@@ -73,14 +73,9 @@ ifdef building_out_of_srctree
 	@if [ "X$(TEST_PROGS)$(TEST_PROGS_EXTENDED)$(TEST_FILES)" != "X" ]; then \
 		rsync -aq $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES) $(OUTPUT); \
 	fi
-	@if [ "X$(TEST_PROGS)" != "X" ]; then \
-		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(OUTPUT)/$(TEST_PROGS)) ; \
-	else \
-		$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS)); \
-	fi
-else
-	@$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS))
 endif
+	@$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) \
+			   $(addprefix $(OUTPUT)/,$(TEST_PROGS)))
 
 define INSTALL_SINGLE_RULE
 	$(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH))
-- 
2.26.2


  parent reply	other threads:[~2020-05-27  7:17 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27  7:16 [RESEND PATCH 0/3] selftests: lib.mk improvements Yauheni Kaliuta
2020-05-27  7:16 ` [RESEND PATCH 1/3] selftests: do not use .ONESHELL Yauheni Kaliuta
2020-05-27  7:16   ` [RESEND PATCH 2/3] selftests: fix condition in run_tests Yauheni Kaliuta
2020-05-27  7:16   ` Yauheni Kaliuta [this message]
2020-06-20  4:46 ` [RESEND PATCH 0/3] selftests: lib.mk improvements Yauheni Kaliuta
2020-06-23 14:00   ` Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200527071659.63426-3-yauheni.kaliuta@redhat.com \
    --to=yauheni.kaliuta@redhat.com \
    --cc=bpf@vger.kernel.org \
    --cc=jbenc@redhat.com \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.