From patchwork Tue Feb 25 23:26:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 11404943 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 B6E7C13A4 for ; Tue, 25 Feb 2020 23:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89FDC24680 for ; Tue, 25 Feb 2020 23:28:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582673303; bh=AXG9qY8xfxZfsbun6EMNib2ecZkzQ66WZo95/pA4kxU=; h=To:Cc:From:Subject:Date:List-ID:From; b=e4bMj4ZGbqW9Ai38OOGkfutEILzZKGhVVdMBCOm6g65AXmYk86tGhL35pIaHMc7x6 acXpZf2PMFnasi6pcBBmIsbsLEIdOE3d8/va9a/kLvLb0/W9jHib7XJhcEUVGR8nKB Rgu6OojF72Inz8l9rUQoUazOGYhHrt6uBkmleEZ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730370AbgBYX2S (ORCPT ); Tue, 25 Feb 2020 18:28:18 -0500 Received: from mail-il1-f169.google.com ([209.85.166.169]:39061 "EHLO mail-il1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730379AbgBYX0p (ORCPT ); Tue, 25 Feb 2020 18:26:45 -0500 Received: by mail-il1-f169.google.com with SMTP id w69so728510ilk.6 for ; Tue, 25 Feb 2020 15:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=to:cc:from:subject:message-id:date:user-agent:mime-version :content-language; bh=TDz13QYqhBENiS22vSmmhoGhcQjNfl8OARybiBG1Mrs=; b=HBnc/4KONIeGgrzzqFfzzttUZ+zEBOdpnk44/IB/4atZrHgxU3/zAAiAswYlUTaSae l9Ey3TdLyO1uiq1tUbiEMNXS1ulmtUTD8+6QKwxjbWV1YZtacKtp8BYUxz9UUROwWAFL JR/I1owdeTpO8ruSP+dcK0d/WF/xzXNC7av/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:message-id:date:user-agent :mime-version:content-language; bh=TDz13QYqhBENiS22vSmmhoGhcQjNfl8OARybiBG1Mrs=; b=ovKorlBc8/wRaFUkpavU+yYYIE9lZpQmnKzcDLaEUuO+TfWh6gMn/cY8UwGEjuEZGV JzPS+QsPgEVxrLYZoNmAZhHzEweCGbu7IY2TAzSJLThs0tr8z6+VPgfpry9gZrly+KIB xweARKscwn5sl87oyFlBb/feOgzdwVMIlVfpsKvAA6dlxaeCEWYi69tAu8gwRs4iEzL+ 78ivKmt5PkP41j7HnYahPYaEVAU1NcWxlLKuV5rHLOQsdcwi1NKsBxGS+nYtViYqydK1 WhxaACMcKkp1+4MwO7/dphKHlbC+jtHvvs6gjPGPPh2XLS/exUF2watN/RBmQqG6nPdT NL8A== X-Gm-Message-State: APjAAAWEETeBk8kJuEZTZViBLWVM9Wnyyz0C16ZKf9qYOVapZ0bK6sWr R+9Z3GxIMJdImb0rJ7Chg4nuWB7lYZY= X-Google-Smtp-Source: APXvYqzWBicpJuvTN7crMyGDBGE/zkCkHcJviVB5SzXZL5zSVMouo/XSxKGOPxmJLBko/qThhhiKyw== X-Received: by 2002:a92:cb89:: with SMTP id z9mr1114854ilo.145.1582673204381; Tue, 25 Feb 2020 15:26:44 -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 z4sm105788ioh.26.2020.02.25.15.26.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Feb 2020 15:26:43 -0800 (PST) To: Linus Torvalds Cc: Shuah Khan , Michael Ellerman , "open list:KERNEL SELFTEST FRAMEWORK" , Linux Kernel Mailing List From: Shuah Khan Subject: [GIT PULL] Kselftest update for Linux 5.6-rc4 Message-ID: <94b64a48-a337-63c4-c504-7e9b0c29a7c6@linuxfoundation.org> Date: Tue, 25 Feb 2020 16:26:42 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 Content-Language: en-US Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Hi Linus, Please pull the following Kselftest fixes update for Linux 5.6-rc4. This Kselftest update for Linux 5.6-rc4 consists of: - fixes to TIMEOUT failures and out-of-tree compilation compilation errors from Michael Ellerman. - Declutter git status fix from Christophe Leroy diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 9a0584f05687947d5a0b87f046bcd2592a55e67c: selftests: openat2: fix build error on newer glibc (2020-02-13 13:15:45 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc4 for you to fetch changes up to ef89d0545132d685f73da6f58b7e7fe002536f91: selftests/rseq: Fix out-of-tree compilation (2020-02-20 08:57:12 -0700) ---------------------------------------------------------------- linux-kselftest-5.6-rc4 This Kselftest update for Linux 5.6-rc4 consists of: - fixes to TIMEOUT failures and out-of-tree compilation compilation errors from Michael Ellerman. - Declutter git status fix from Christophe Leroy ---------------------------------------------------------------- Christophe Leroy (1): selftest/lkdtm: Don't pollute 'git status' Michael Ellerman (2): selftests: Install settings files to fix TIMEOUT failures selftests/rseq: Fix out-of-tree compilation .gitignore | 4 ++++ tools/testing/selftests/ftrace/Makefile | 2 +- tools/testing/selftests/livepatch/Makefile | 2 ++ tools/testing/selftests/net/mptcp/Makefile | 2 ++ tools/testing/selftests/rseq/Makefile | 4 +++- tools/testing/selftests/rtc/Makefile | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 72ef86a5570d..2763fce8766c 100644 --- a/.gitignore +++ b/.gitignore @@ -100,6 +100,10 @@ modules.order /include/ksym/ /arch/*/include/generated/ +# Generated lkdtm tests +/tools/testing/selftests/lkdtm/*.sh +!/tools/testing/selftests/lkdtm/run.sh + # stgit generated dirs patches-* 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..2af9d39a9716 100644 --- a/tools/testing/selftests/rseq/Makefile +++ b/tools/testing/selftests/rseq/Makefile @@ -4,7 +4,7 @@ ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) CLANG_FLAGS += -no-integrated-as endif -CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L./ -Wl,-rpath=./ \ +CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L$(OUTPUT) -Wl,-rpath=./ \ $(CLANG_FLAGS) LDLIBS += -lpthread @@ -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 2d93d65723c9..55198ecc04db 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