| Message ID | 94b64a48-a337-63c4-c504-7e9b0c29a7c6@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 2fcc74178f6dc06ecffcd1f601ca3a3e87b3012c |
| Headers | show |
| Series | [GIT,PULL] Kselftest update for Linux 5.6-rc4 | expand |
On Tue, Feb 25, 2020 at 3:26 PM Shuah Khan <skhan@linuxfoundation.org> wrote: > > - Declutter git status fix from Christophe Leroy I've pulled this, but just for future reference (and hoping for a future cleanup patch): instead of putting things in the global .gitignore file, do it in the relevant local one. So you could just have added *.sh !run.sh in 'tools/testing/selftests/lkdtm/.gitignore' instead of doing # Generated lkdtm tests /tools/testing/selftests/lkdtm/*.sh !/tools/testing/selftests/lkdtm/run.sh in the top-level one. That keeps things much better separated. It also incidentally means that if a directory gets renamed, the gitignore file just "magically" continues to work (if you rename the actual files themselves that are named in gitignore, then that's obviously a different thing). If you put it in the leaf directory, it also means that you don't need the '/' at the beginning, because the local gitignore entries will only affect that subdirectory (and any subdirectories under it). So please put only "global" gitignore patterns in the top-level gitignore file. Linus
On 2/26/20 11:14 AM, Linus Torvalds wrote: > On Tue, Feb 25, 2020 at 3:26 PM Shuah Khan <skhan@linuxfoundation.org> wrote: >> >> - Declutter git status fix from Christophe Leroy > > I've pulled this, but just for future reference (and hoping for a > future cleanup patch): instead of putting things in the global > .gitignore file, do it in the relevant local one. > > So you could just have added > > *.sh > !run.sh > > in 'tools/testing/selftests/lkdtm/.gitignore' instead of doing > > # Generated lkdtm tests > /tools/testing/selftests/lkdtm/*.sh > !/tools/testing/selftests/lkdtm/run.sh > > in the top-level one. > > That keeps things much better separated. It also incidentally means > that if a directory gets renamed, the gitignore file just "magically" > continues to work (if you rename the actual files themselves that are > named in gitignore, then that's obviously a different thing). > > If you put it in the leaf directory, it also means that you don't need > the '/' at the beginning, because the local gitignore entries will > only affect that subdirectory (and any subdirectories under it). > > So please put only "global" gitignore patterns in the top-level gitignore file. > > Linus > Thanks. I will keep this mind as I review these kinds of patches. -- Shuah
The pull request you sent on Tue, 25 Feb 2020 16:26:42 -0700:
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc4
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2fcc74178f6dc06ecffcd1f601ca3a3e87b3012c
Thank you!
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
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(-) ----------------------------------------------------------------