From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0690EC11D27 for ; Thu, 20 Feb 2020 22:43:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAE24208E4 for ; Thu, 20 Feb 2020 22:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582238613; bh=fqS/GgJhbDw3EiROWcshwv2AULT4Lp4hI49kgB6rvjI=; h=Subject:To:Cc:References:From:Date:In-Reply-To:List-ID:From; b=N7JD0kZTCNAjWl/kJZWO4zi15rhXUKkS3ql7TVsqeElL9ev96LR3bKNFW9H3HhwD2 jYF1GOkF1DlPVslrwBEf/15abQQ3jDHvUANUiLQOFTWuLafa+m5keD0uU2GbB4FLmH bvoDyD0KpO3B40LIiY8EJZPIYOVV/WY4NdYUy0mk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729273AbgBTWnd (ORCPT ); Thu, 20 Feb 2020 17:43:33 -0500 Received: from mail-io1-f67.google.com ([209.85.166.67]:45159 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729270AbgBTWnd (ORCPT ); Thu, 20 Feb 2020 17:43:33 -0500 Received: by mail-io1-f67.google.com with SMTP id i11so220473ioi.12 for ; Thu, 20 Feb 2020 14:43:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=QMjt5eMffPrxsp8wLASdON0xDaLfdUvYn5lYknm2C7s=; b=U5BnmuHOGKVpr/W6Cro6664PAOER/DtOGOsEpfY5j6rtJSGN9oL0XY/pMjcABpYdAK nQp3dt8cHofYWcHKPvSP2oThQHseVJShwHXr49gfQrO3wh6N6CB6jYZb725MViJB5CEX Oe/gc/VYz5Cz9/0vnBKWZzKirh1zXqDLTtkF8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=QMjt5eMffPrxsp8wLASdON0xDaLfdUvYn5lYknm2C7s=; b=IcCay9230GMj8RQeSbLo+8j+6htp2Sl+8l4CWrx8KTgzisAws+msn0AjvaNIFUCEuZ i3ctIXjJ8mtTgzIRtkv/GNAL/e2LABJnJ8B0lTIZ4k4pBVA5jvCSdqAx9PosKEAKbBwp kMx553kP7a77kc5mAb/zJFoXRNx93iqqFhFi26O7pH/ayM5mZezdIxDO8pPfjXnJg25v xbRxhglW4NDz90743FPc9P8y0kxcLENgEgZS/N1vuBDX0NsN1Fn6waJ/dxos3UucIQ3P 2TWmV6yB6TE/4xfR7Lz2KXQiajmiPwlr0DBl6WCdB6hAGcV3HmBFJlgL/7De6T8+3QfE XGlw== X-Gm-Message-State: APjAAAVfWPtt5BbgVRqUohXIEO9qe56+i+5MbxhK+1z5o71CN1UGQ5vv NZb7znsqQh2drnWuORkCo7jPOQ== X-Google-Smtp-Source: APXvYqwCY4UOWE++mhaJRMIkoNG+w9qtz8+0BXm1Ky4fUgUzfUISeECpFGgnh904ZRETno0/85HHnQ== X-Received: by 2002:a5d:8ad8:: with SMTP id e24mr27269446iot.291.1582238611058; Thu, 20 Feb 2020 14:43:31 -0800 (PST) Received: from [192.168.1.112] (c-24-9-64-241.hsd1.co.comcast.net. [24.9.64.241]) by smtp.gmail.com with ESMTPSA id h19sm229536ild.76.2020.02.20.14.43.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 20 Feb 2020 14:43:30 -0800 (PST) Subject: Re: [PATCH] selftests: Install settings files to fix TIMEOUT failures To: Joe Lawrence , Michael Ellerman , linux-kselftest@vger.kernel.org Cc: keescook@chromium.org, linux-kernel@vger.kernel.org, Shuah Khan References: <20200220044241.2878-1-mpe@ellerman.id.au> <85385291-b039-c72d-508a-0b988c1302b5@redhat.com> From: Shuah Khan Message-ID: Date: Thu, 20 Feb 2020 15:43:29 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <85385291-b039-c72d-508a-0b988c1302b5@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org On 2/20/20 3:25 PM, Joe Lawrence wrote: > On 2/19/20 11:42 PM, Michael Ellerman wrote: >> Commit 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second >> timeout per test") added a 45 second timeout for tests, and also added >> a way for tests to customise the timeout via a settings file. >> >> For example the ftrace tests take multiple minutes to run, so they >> were given longer in commit b43e78f65b1d ("tracing/selftests: Turn off >> timeout setting"). >> >> This works when the tests are run from the source tree. However if the >> tests are installed with "make -C tools/testing/selftests install", >> the settings files are not copied into the install directory. When the >> tests are then run from the install directory the longer timeouts are >> not applied and the tests timeout incorrectly. >> >> So add the settings files to TEST_FILES of the appropriate Makefiles >> to cause the settings files to be installed using the existing install >> logic. >> >> Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second >> timeout per test") >> Signed-off-by: Michael Ellerman >> --- >>   tools/testing/selftests/ftrace/Makefile    | 2 +- >>   tools/testing/selftests/livepatch/Makefile | 2 ++ >>   tools/testing/selftests/net/mptcp/Makefile | 2 ++ >>   tools/testing/selftests/rseq/Makefile      | 2 ++ >>   tools/testing/selftests/rtc/Makefile       | 2 ++ >>   5 files changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/tools/testing/selftests/ftrace/Makefile >> b/tools/testing/selftests/ftrace/Makefile >> index cd1f5b3a7774..d6e106fbce11 100644 >> --- a/tools/testing/selftests/ftrace/Makefile >> +++ b/tools/testing/selftests/ftrace/Makefile >> @@ -2,7 +2,7 @@ >>   all: >>   TEST_PROGS := ftracetest >> -TEST_FILES := test.d >> +TEST_FILES := test.d settings >>   EXTRA_CLEAN := $(OUTPUT)/logs/* >>   include ../lib.mk >> diff --git a/tools/testing/selftests/livepatch/Makefile >> b/tools/testing/selftests/livepatch/Makefile >> index 3876d8d62494..1acc9e1fa3fb 100644 >> --- a/tools/testing/selftests/livepatch/Makefile >> +++ b/tools/testing/selftests/livepatch/Makefile >> @@ -8,4 +8,6 @@ TEST_PROGS := \ >>       test-state.sh \ >>       test-ftrace.sh >> +TEST_FILES := settings >> + >>   include ../lib.mk >> diff --git a/tools/testing/selftests/net/mptcp/Makefile >> b/tools/testing/selftests/net/mptcp/Makefile >> index 93de52016dde..ba450e62dc5b 100644 >> --- a/tools/testing/selftests/net/mptcp/Makefile >> +++ b/tools/testing/selftests/net/mptcp/Makefile >> @@ -8,6 +8,8 @@ TEST_PROGS := mptcp_connect.sh >>   TEST_GEN_FILES = mptcp_connect >> +TEST_FILES := settings >> + >>   EXTRA_CLEAN := *.pcap >>   include ../../lib.mk >> diff --git a/tools/testing/selftests/rseq/Makefile >> b/tools/testing/selftests/rseq/Makefile >> index d6469535630a..f1053630bb6f 100644 >> --- a/tools/testing/selftests/rseq/Makefile >> +++ b/tools/testing/selftests/rseq/Makefile >> @@ -19,6 +19,8 @@ TEST_GEN_PROGS_EXTENDED = librseq.so >>   TEST_PROGS = run_param_test.sh >> +TEST_FILES := settings >> + >>   include ../lib.mk >>   $(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h >> diff --git a/tools/testing/selftests/rtc/Makefile >> b/tools/testing/selftests/rtc/Makefile >> index de9c8566672a..90fa1a346908 100644 >> --- a/tools/testing/selftests/rtc/Makefile >> +++ b/tools/testing/selftests/rtc/Makefile >> @@ -6,4 +6,6 @@ TEST_GEN_PROGS = rtctest >>   TEST_GEN_PROGS_EXTENDED = setdate >> +TEST_FILES := settings >> + >>   include ../lib.mk >> > > Looks good to me, > > Acked-by: Joe Lawrence > Thanks for Ack. I already applied it to kselftest fixes branch. https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/log/?h=fixes thanks, -- Shuah