From patchwork Wed Nov 6 10:29:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1190262 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 477N7c0ZqJz9sR0; Wed, 6 Nov 2019 21:29:32 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iSIZ6-0005Ld-1P; Wed, 06 Nov 2019 10:29:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSIZ0-0005JK-7r for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 10:29:22 +0000 Received: from mail-pf1-f198.google.com ([209.85.210.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSIYz-0003s1-Qe for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 10:29:22 +0000 Received: by mail-pf1-f198.google.com with SMTP id m185so18654950pfb.11 for ; Wed, 06 Nov 2019 02:29:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=EZDIQANA+YfYtVUGKq5VpGLsI11+OgFW7CevBgfgBF0=; b=kj8ZiRPEb6L4VSSSwqdqXkHPdPkluqMq/mzl8kEampbJxF/wWh6WfJBYyzYBhXP5vG sQcQlynIZ+Cx7EckO4RGkC7qLRXFP99c7ojwgtp/N+fDjz2A802OARNj3Pc3yYD/lQ1t v3EXu4PwPxxRT+bg3gEOqZ9GMNzrHP/0JYwAG1T8TH+Heqi+WF+WtEM6wSTrWNRs9FtP xa5kMKWLpwvu70gh6GPaqhNGbXeMAhIsXOzpxJ5AM/j5mMp/91Bm8aQGgAgX3E+LAv6s /OjslpXh/KnBAInEfxYsg09TWw+akNkqlNur0jp/VEAadquFj95YMS8+VltPI98UbLqo YmlA== X-Gm-Message-State: APjAAAX3ECfN4+EjoxiYn5yAooPEtOkBzGtxxcqYS2Rs8er4Xynlc55I TGLyh1tEuzq1zHpWUegYqJrCxjU8zVvXH4KzNCKY0OCyf8fg5/8mtUBncgl02dnOgIL7WQgTFPR 7o4gTSSVHnIJFfvaflHcGqnurewBJvmuaGZCjAkKq X-Received: by 2002:a17:90a:9b87:: with SMTP id g7mr2798017pjp.64.1573036160261; Wed, 06 Nov 2019 02:29:20 -0800 (PST) X-Google-Smtp-Source: APXvYqyJGdyh7pztt05H0FrLXnRV652pr5tiw9OGZOUa1FCx+ks14epwwFvi6dN2ww+v2Ybh4fuhYA== X-Received: by 2002:a17:90a:9b87:: with SMTP id g7mr2797976pjp.64.1573036159849; Wed, 06 Nov 2019 02:29:19 -0800 (PST) Received: from Leggiero.taipei.internal (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id x10sm19872046pgl.53.2019.11.06.02.29.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 02:29:19 -0800 (PST) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [Bionic][SRU][PATCH 3/4] selftests: lib.mk: cleanup RUN_TESTS define and make it readable Date: Wed, 6 Nov 2019 18:29:05 +0800 Message-Id: <20191106102906.28118-4-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191106102906.28118-1-po-hsu.lin@canonical.com> References: <20191106102906.28118-1-po-hsu.lin@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "Shuah Khan (Samsung OSG)" BugLink: https://bugs.launchpad.net/bugs/1812352 Refine RUN_TESTS define's output block for summary and non-summary code to remove duplicate code and make it readable. cd `dirname $$TEST` > /dev/null; and cd - > /dev/null; are moved to common code block and indentation fixed. Signed-off-by: Shuah Khan (Samsung OSG) (cherry picked from commit 42b44c34136857ccdf90ebb1cbc38f2bf0aec7a1) Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/lib.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index a001ccc..0b76e4a 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -44,11 +44,13 @@ define RUN_TESTS echo "selftests: Warning: file $$BASENAME_TEST is not executable, correct this.";\ echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \ else \ - if [ "X$(summary)" != "X" ]; then \ - cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\ + cd `dirname $$TEST` > /dev/null; \ + if [ "X$(summary)" != "X" ]; then \ + (./$$BASENAME_TEST > /tmp/$$BASENAME_TEST 2>&1 && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \ else \ - cd `dirname $$TEST` > /dev/null; (./$$BASENAME_TEST && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; cd - > /dev/null;\ + (./$$BASENAME_TEST && echo "ok 1..$$test_num selftests: $$BASENAME_TEST [PASS]") || echo "not ok 1..$$test_num selftests: $$BASENAME_TEST [FAIL]"; \ fi; \ + cd - > /dev/null; \ fi; \ done; endef