From patchwork Wed May 27 07:16:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yauheni Kaliuta X-Patchwork-Id: 11572139 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 411691392 for ; Wed, 27 May 2020 07:17:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28E9520C09 for ; Wed, 27 May 2020 07:17:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="BxGeobD3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729140AbgE0HRG (ORCPT ); Wed, 27 May 2020 03:17:06 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27719 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728989AbgE0HRG (ORCPT ); Wed, 27 May 2020 03:17:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590563825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CddcCML9u77RP1qItK3WVdNaZvzlZ+4uDdw9FYA4Ktg=; b=BxGeobD34usd9FTKKjVQ+yf/pjCNeuaNP8HK+9P6SIQ4IQRQbsirCX0jfPfs6rBnpT4A6W FHLLEo7ntMWKOEmsnzrHgTcyt4KWWCpKOf2U6WzlB+mBilfk0iDExIXBy5SxB6qbRFjIh/ eLK7nYfF5Ls3i2Z10mUSbHCa2S+T+MY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-310-BKM9Wne5OaGnz_K7qGU5bg-1; Wed, 27 May 2020 03:17:04 -0400 X-MC-Unique: BKM9Wne5OaGnz_K7qGU5bg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1A7A818A0760; Wed, 27 May 2020 07:17:03 +0000 (UTC) Received: from astarta.redhat.com (ovpn-114-49.ams2.redhat.com [10.36.114.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B858E5C1B0; Wed, 27 May 2020 07:17:01 +0000 (UTC) From: Yauheni Kaliuta To: linux-kselftest@vger.kernel.org Cc: jbenc@redhat.com, Shuah Khan , bpf@vger.kernel.org Subject: [RESEND PATCH 1/3] selftests: do not use .ONESHELL Date: Wed, 27 May 2020 10:16:57 +0300 Message-Id: <20200527071659.63426-1-yauheni.kaliuta@redhat.com> In-Reply-To: <20200527071629.63364-1-yauheni.kaliuta@redhat.com> References: <20200527071629.63364-1-yauheni.kaliuta@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Using one shell for the whole recipe with long lists can cause make[1]: execvp: /bin/sh: Argument list too long with some shells. Triggered by commit 309b81f0fdc4 ("selftests/bpf: Install generated test progs") It requires to change the rule which rely on the one shell behaviour (run_tests). Simplify also INSTALL_SINGLE_RULE, remove extra echo, required to workaround .ONESHELL. Signed-off-by: Yauheni Kaliuta Cc: Jiri Benc Cc: Shuah Khan --- tools/testing/selftests/lib.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index b0556c752443..5b82433d88e3 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -59,9 +59,8 @@ else all: $(TEST_GEN_PROGS) $(TEST_GEN_PROGS_EXTENDED) $(TEST_GEN_FILES) endif -.ONESHELL: define RUN_TESTS - @BASE_DIR="$(selfdir)"; \ + BASE_DIR="$(selfdir)"; \ . $(selfdir)/kselftest/runner.sh; \ if [ "X$(summary)" != "X" ]; then \ per_test_logging=1; \ @@ -71,22 +70,21 @@ endef run_tests: all 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) + @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)) + @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)) + @$(call RUN_TESTS, $(TEST_GEN_PROGS) $(TEST_CUSTOM_PROGS) $(TEST_PROGS)) endif define INSTALL_SINGLE_RULE $(if $(INSTALL_LIST),@mkdir -p $(INSTALL_PATH)) - $(if $(INSTALL_LIST),@echo rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) - $(if $(INSTALL_LIST),@rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) + $(if $(INSTALL_LIST),rsync -a $(INSTALL_LIST) $(INSTALL_PATH)/) endef define INSTALL_RULE From patchwork Wed May 27 07:16:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yauheni Kaliuta X-Patchwork-Id: 11572141 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 239C21392 for ; Wed, 27 May 2020 07:17:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0303120C09 for ; Wed, 27 May 2020 07:17:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="A2dqnZV2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729283AbgE0HRI (ORCPT ); Wed, 27 May 2020 03:17:08 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:53721 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728989AbgE0HRI (ORCPT ); Wed, 27 May 2020 03:17:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590563827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U2SQc7Kw0tOOlWxNV9I62/TRj+qmAVOcVhm20UoLLYM=; b=A2dqnZV2flOzsylnFGQCA8jJtqKDUk5R1m70ZhVw/FDbkCnZOKgwtyr2mo+4j+xrmuZUxs Qlk0/wrJ8sJDwNsnsgfx5SDYgWxCCnamlM4XZG5W4f3Y4szX1jDa2O6oiKAynRwLc/chkI NEH3eXAq6kS0XTcnQwgtb73YJSo0WUU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-RVfEtrgwMY2QDPSzfbDXqQ-1; Wed, 27 May 2020 03:17:05 -0400 X-MC-Unique: RVfEtrgwMY2QDPSzfbDXqQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CF498EC1A2; Wed, 27 May 2020 07:17:04 +0000 (UTC) Received: from astarta.redhat.com (ovpn-114-49.ams2.redhat.com [10.36.114.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 796055C1B0; Wed, 27 May 2020 07:17:03 +0000 (UTC) From: Yauheni Kaliuta To: linux-kselftest@vger.kernel.org Cc: jbenc@redhat.com, Shuah Khan , bpf@vger.kernel.org Subject: [RESEND PATCH 2/3] selftests: fix condition in run_tests Date: Wed, 27 May 2020 10:16:58 +0300 Message-Id: <20200527071659.63426-2-yauheni.kaliuta@redhat.com> In-Reply-To: <20200527071659.63426-1-yauheni.kaliuta@redhat.com> References: <20200527071629.63364-1-yauheni.kaliuta@redhat.com> <20200527071659.63426-1-yauheni.kaliuta@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The check if there are any files to install in case of no files compares "X " with "X" so never false. Remove extra spaces. It may make sense to use make's $(if) function here. Signed-off-by: Yauheni Kaliuta --- tools/testing/selftests/lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 5b82433d88e3..7a17ea815736 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -70,7 +70,7 @@ endef run_tests: all ifdef building_out_of_srctree - @if [ "X$(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES)" != "X" ]; then \ + @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 \ From patchwork Wed May 27 07:16:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yauheni Kaliuta X-Patchwork-Id: 11572143 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA13592A for ; Wed, 27 May 2020 07:17:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 981CA20C09 for ; Wed, 27 May 2020 07:17:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TmpIRbMi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729287AbgE0HRM (ORCPT ); Wed, 27 May 2020 03:17:12 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34493 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728611AbgE0HRM (ORCPT ); Wed, 27 May 2020 03:17:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590563831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KeFCFQKYr22MWNIUPQRp475JW512YZ2vYFblYXBP+94=; b=TmpIRbMii+GE5EeVl2TdVbsFurSYaRQviR6vti0dy3UQhGbRp2kytZFPZsoQBnrSOVwlv4 8SEYrEYwN1zEM0Ml0o1kfaWdbmSphAEroQ5ZQX+w6qyUd4aplQ2iu3iYPlCd/hBGrXm8j+ gTJ38myKqBHYCuNvapvnjgJ1Cre4sXY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-_kTiZn9_PW6LPz8VayOF5A-1; Wed, 27 May 2020 03:17:09 -0400 X-MC-Unique: _kTiZn9_PW6LPz8VayOF5A-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CD8618A0760; Wed, 27 May 2020 07:17:08 +0000 (UTC) Received: from astarta.redhat.com (ovpn-114-49.ams2.redhat.com [10.36.114.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 39DDE5C1B0; Wed, 27 May 2020 07:17:05 +0000 (UTC) From: Yauheni Kaliuta To: linux-kselftest@vger.kernel.org Cc: jbenc@redhat.com, Shuah Khan , bpf@vger.kernel.org Subject: [RESEND PATCH 3/3] selftests: simplify run_tests Date: Wed, 27 May 2020 10:16:59 +0300 Message-Id: <20200527071659.63426-3-yauheni.kaliuta@redhat.com> In-Reply-To: <20200527071659.63426-1-yauheni.kaliuta@redhat.com> References: <20200527071629.63364-1-yauheni.kaliuta@redhat.com> <20200527071659.63426-1-yauheni.kaliuta@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org 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 --- 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))