From a8bf4da183824caa5fceaf7546db52daa05f8662 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 12 Feb 2018 13:05:19 +0200 Subject: oe-selftest: fix tests to reflect man->man-db transition Rather than apply a patch twice, an incorrect patch is applied (as the new man-db recipe does not have any patches yet). Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- .../man-db/files/0001-Test-patch-here.patch | 22 ++++++++++++++++++++++ .../recipes-test/man-db/man-db_%.bbappend | 2 ++ .../recipes-test/man/man/man-1.5h1-make.patch | 16 ---------------- meta-selftest/recipes-test/man/man_1.6g.bbappend | 2 -- 4 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch create mode 100644 meta-selftest/recipes-test/man-db/man-db_%.bbappend delete mode 100644 meta-selftest/recipes-test/man/man/man-1.5h1-make.patch delete mode 100644 meta-selftest/recipes-test/man/man_1.6g.bbappend (limited to 'meta-selftest') diff --git a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch new file mode 100644 index 0000000000..b1d5eab2b8 --- /dev/null +++ b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch @@ -0,0 +1,22 @@ +From efc8831f33106e6b48de8e612c2d816fe7d1ae68 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 9 Feb 2018 17:37:48 +0200 +Subject: [PATCH] Test patch here! + +This is an invalid patch used by oe-selftest +--- + README | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/README b/README +index 48fff57..26d1234 100644 +--- a/README ++++ b/README +@@ -1,3 +1,4 @@ ++This is a test patch for purposes of oe-selftest + THIS LINE MAKES THIS PATCH INVALID README for the man-db manual pager suite + ======================================== + +-- +2.15.1 + diff --git a/meta-selftest/recipes-test/man-db/man-db_%.bbappend b/meta-selftest/recipes-test/man-db/man-db_%.bbappend new file mode 100644 index 0000000000..205720982c --- /dev/null +++ b/meta-selftest/recipes-test/man-db/man-db_%.bbappend @@ -0,0 +1,2 @@ +# This bbappend is used to alter the recipe using the test_recipe.inc file created by tests. +include test_recipe.inc diff --git a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch b/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch deleted file mode 100644 index a0d59b78ce..0000000000 --- a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch +++ /dev/null @@ -1,16 +0,0 @@ -Test patch here! -This is invalid patch used by tests in scripts/lib/selftests. - ---- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999 -+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999 -@@ -1,8 +1,8 @@ - #MAKE THIS PATCH INVALID - MAN1 = man whatis apropos --MAN5 = man.conf -+MAN5 = man.config - MAN8 = makewhatis --ALL = man.1 whatis.1 apropos.1 man.conf.5 -+ALL = man.1 whatis.1 apropos.1 man.config.5 - MAYBE8 = makewhatis - - .SUFFIXES: .man .1 .5 .8 diff --git a/meta-selftest/recipes-test/man/man_1.6g.bbappend b/meta-selftest/recipes-test/man/man_1.6g.bbappend deleted file mode 100644 index 205720982c..0000000000 --- a/meta-selftest/recipes-test/man/man_1.6g.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# This bbappend is used to alter the recipe using the test_recipe.inc file created by tests. -include test_recipe.inc -- cgit 1.2.3-korg