zlib: clean up ptest

Instead of patching and sedding the makefile, just install test/example and
execute it in run-ptest.  example is the bulk of the test suite, as minimal as
it is.

(From OE-Core rev: ea86bdb8935668d41e142676815af38911ee0faa)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 1 insertions, 15 deletions

diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb
index 41ec29d95e..ef9431ae47 100644
--- a/meta/recipes-core/zlib/zlib_1.2.11.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.11.bb
@@ -7,7 +7,6 @@ LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zlib.h;beginline=6;endline=23;md5=5377232268e952e9ef63bc555f7aa6c0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
-           file://Makefile-runtests.patch \
            file://ldflags-tests.patch \
            file://run-ptest \
            "
@@ -30,25 +29,12 @@ do_compile() {
         oe_runmake shared
 }
 
-do_compile_ptest() {
-        oe_runmake test
-}
-
 do_install() {
         oe_runmake DESTDIR=${D} install
 }
 
 do_install_ptest() {
-        install ${B}/Makefile   ${D}${PTEST_PATH}
-        install ${B}/example    ${D}${PTEST_PATH}
-        install ${B}/minigzip   ${D}${PTEST_PATH}
-        install ${B}/examplesh  ${D}${PTEST_PATH}
-        install ${B}/minigzipsh ${D}${PTEST_PATH}
-
-        # Remove buildhost references...
-        sed -i -e "s,--sysroot=${STAGING_DIR_TARGET},,g" \
-                -e 's|${DEBUG_PREFIX_MAP}||g' \
-         ${D}${PTEST_PATH}/Makefile
+        install ${B}/examplesh ${D}${PTEST_PATH}
 }
 
 # Move zlib shared libraries for target builds to $base_libdir so the library