ltp: refresh patches

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 040b4bb125e28750e089f631c1debb088bb3bc9f)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-03-09 20:55:58 +02:00
committed by Richard Purdie
parent 8467b0602b
commit 24229c4769
2 changed files with 51 additions and 56 deletions

View File

@@ -22,10 +22,10 @@ Upstream-Status: Pending
testcases/realtime/stress/pi-tests/Makefile | 5 +++++ testcases/realtime/stress/pi-tests/Makefile | 5 +++++
8 files changed, 35 insertions(+), 2 deletions(-) 8 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile Index: git/Makefile
index 297f8e7..906b280 100644 ===================================================================
--- a/Makefile --- git.orig/Makefile
+++ b/Makefile +++ git/Makefile
@@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0 @@ -49,6 +49,11 @@ SKIP_IDCHECK ?= 0
UCLINUX ?= 0 UCLINUX ?= 0
export UCLINUX export UCLINUX
@@ -38,11 +38,11 @@ index 297f8e7..906b280 100644
# CLEAN_TARGETS: Targets which exist solely in clean. # CLEAN_TARGETS: Targets which exist solely in clean.
# COMMON_TARGETS: Targets which exist in all, clean, and install. # COMMON_TARGETS: Targets which exist in all, clean, and install.
# INSTALL_TARGETS: Targets which exist in clean and install (contains # INSTALL_TARGETS: Targets which exist in clean and install (contains
diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile Index: git/testcases/kernel/Makefile
index 50a12fa..4f1987f 100644 ===================================================================
--- a/testcases/kernel/Makefile --- git.orig/testcases/kernel/Makefile
+++ b/testcases/kernel/Makefile +++ git/testcases/kernel/Makefile
@@ -47,13 +47,16 @@ SUBDIRS += connectors \ @@ -48,13 +48,16 @@ SUBDIRS += connectors \
logging \ logging \
mem \ mem \
numa \ numa \
@@ -60,10 +60,10 @@ index 50a12fa..4f1987f 100644
ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes)
SUBDIRS += power_management SUBDIRS += power_management
endif endif
diff --git a/testcases/kernel/sched/Makefile b/testcases/kernel/sched/Makefile Index: git/testcases/kernel/sched/Makefile
index 6245ed0..aa4eb7f 100644 ===================================================================
--- a/testcases/kernel/sched/Makefile --- git.orig/testcases/kernel/sched/Makefile
+++ b/testcases/kernel/sched/Makefile +++ git/testcases/kernel/sched/Makefile
@@ -23,5 +23,7 @@ @@ -23,5 +23,7 @@
top_srcdir ?= ../../.. top_srcdir ?= ../../..
@@ -73,11 +73,11 @@ index 6245ed0..aa4eb7f 100644
+ FILTER_OUT_DIRS += process_stress + FILTER_OUT_DIRS += process_stress
+endif +endif
include $(top_srcdir)/include/mk/generic_trunk_target.mk include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile Index: git/testcases/kernel/syscalls/Makefile
index 8acb395..b749126 100644 ===================================================================
--- a/testcases/kernel/syscalls/Makefile --- git.orig/testcases/kernel/syscalls/Makefile
+++ b/testcases/kernel/syscalls/Makefile +++ git/testcases/kernel/syscalls/Makefile
@@ -28,5 +28,10 @@ ifeq ($(UCLINUX),1) @@ -28,6 +28,11 @@ ifeq ($(UCLINUX),1)
FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \ FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
mincore mprotect nftw profil remap_file_pages sbrk mincore mprotect nftw profil remap_file_pages sbrk
endif endif
@@ -87,12 +87,13 @@ index 8acb395..b749126 100644
+ ustat + ustat
+endif +endif
include $(top_srcdir)/include/mk/generic_trunk_target.mk ifeq ($(UCLIBC),1)
diff --git a/testcases/network/nfsv4/acl/Makefile b/testcases/network/nfsv4/acl/Makefile FILTER_OUT_DIRS += profil
index 8bc78c2..c36cf50 100644 Index: git/testcases/network/nfsv4/acl/Makefile
--- a/testcases/network/nfsv4/acl/Makefile ===================================================================
+++ b/testcases/network/nfsv4/acl/Makefile --- git.orig/testcases/network/nfsv4/acl/Makefile
@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre.mk +++ git/testcases/network/nfsv4/acl/Makefile
@@ -26,4 +26,8 @@ include $(top_srcdir)/include/mk/env_pre
LDLIBS += $(ACL_LIBS) LDLIBS += $(ACL_LIBS)
@@ -101,10 +102,10 @@ index 8bc78c2..c36cf50 100644
+endif +endif
+ +
include $(top_srcdir)/include/mk/generic_leaf_target.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/network/rpc/basic_tests/Makefile b/testcases/network/rpc/basic_tests/Makefile Index: git/testcases/network/rpc/basic_tests/Makefile
index 3160813..9bdf5d0 100644 ===================================================================
--- a/testcases/network/rpc/basic_tests/Makefile --- git.orig/testcases/network/rpc/basic_tests/Makefile
+++ b/testcases/network/rpc/basic_tests/Makefile +++ git/testcases/network/rpc/basic_tests/Makefile
@@ -23,4 +23,9 @@ @@ -23,4 +23,9 @@
top_srcdir ?= ../../../.. top_srcdir ?= ../../../..
@@ -115,11 +116,11 @@ index 3160813..9bdf5d0 100644
+endif +endif
+ +
include $(top_srcdir)/include/mk/generic_trunk_target.mk include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/realtime/func/pi-tests/Makefile b/testcases/realtime/func/pi-tests/Makefile Index: git/testcases/realtime/func/pi-tests/Makefile
index 7a7a57a..5808866 100644 ===================================================================
--- a/testcases/realtime/func/pi-tests/Makefile --- git.orig/testcases/realtime/func/pi-tests/Makefile
+++ b/testcases/realtime/func/pi-tests/Makefile +++ git/testcases/realtime/func/pi-tests/Makefile
@@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre.mk @@ -27,5 +27,9 @@ include $(top_srcdir)/include/mk/env_pre
include $(abs_srcdir)/../../config.mk include $(abs_srcdir)/../../config.mk
MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex MAKE_TARGETS := testpi-0 testpi-1 testpi-2 testpi-4 testpi-5 testpi-6 testpi-7 sbrk_mutex
@@ -129,10 +130,10 @@ index 7a7a57a..5808866 100644
+ +
include $(top_srcdir)/include/mk/generic_leaf_target.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/realtime/stress/pi-tests/Makefile b/testcases/realtime/stress/pi-tests/Makefile Index: git/testcases/realtime/stress/pi-tests/Makefile
index 5edc3b4..aa5987a 100644 ===================================================================
--- a/testcases/realtime/stress/pi-tests/Makefile --- git.orig/testcases/realtime/stress/pi-tests/Makefile
+++ b/testcases/realtime/stress/pi-tests/Makefile +++ git/testcases/realtime/stress/pi-tests/Makefile
@@ -24,4 +24,9 @@ top_srcdir ?= ../../../.. @@ -24,4 +24,9 @@ top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/env_pre.mk include $(top_srcdir)/include/mk/env_pre.mk
@@ -143,6 +144,3 @@ index 5edc3b4..aa5987a 100644
+endif +endif
+ +
include $(top_srcdir)/include/mk/generic_leaf_target.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk
--
2.7.0

View File

@@ -18,10 +18,10 @@ Upstream-Status: Pending
testcases/kernel/syscalls/mremap/mremap03.c | 2 ++ testcases/kernel/syscalls/mremap/mremap03.c | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-) 3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c Index: git/testcases/kernel/syscalls/mremap/mremap01.c
index d63d1e4..24ca174 100644 ===================================================================
--- a/testcases/kernel/syscalls/mremap/mremap01.c --- git.orig/testcases/kernel/syscalls/mremap/mremap01.c
+++ b/testcases/kernel/syscalls/mremap/mremap01.c +++ git/testcases/kernel/syscalls/mremap/mremap01.c
@@ -76,10 +76,12 @@ @@ -76,10 +76,12 @@
*/ */
#include <unistd.h> #include <unistd.h>
@@ -35,11 +35,11 @@ index d63d1e4..24ca174 100644
+#undef _GNU_SOURCE +#undef _GNU_SOURCE
#include "test.h" #include "test.h"
#include "safe_macros.h"
diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c Index: git/testcases/kernel/syscalls/mremap/mremap02.c
index 5a51b9a..a530a6b 100644 ===================================================================
--- a/testcases/kernel/syscalls/mremap/mremap02.c --- git.orig/testcases/kernel/syscalls/mremap/mremap02.c
+++ b/testcases/kernel/syscalls/mremap/mremap02.c +++ git/testcases/kernel/syscalls/mremap/mremap02.c
@@ -75,9 +75,11 @@ @@ -75,9 +75,11 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@@ -52,10 +52,10 @@ index 5a51b9a..a530a6b 100644
#include "test.h" #include "test.h"
diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c Index: git/testcases/kernel/syscalls/mremap/mremap03.c
index 12e3829..9b39f8b 100644 ===================================================================
--- a/testcases/kernel/syscalls/mremap/mremap03.c --- git.orig/testcases/kernel/syscalls/mremap/mremap03.c
+++ b/testcases/kernel/syscalls/mremap/mremap03.c +++ git/testcases/kernel/syscalls/mremap/mremap03.c
@@ -76,9 +76,11 @@ @@ -76,9 +76,11 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
@@ -68,6 +68,3 @@ index 12e3829..9b39f8b 100644
#include "test.h" #include "test.h"
--
2.7.0