From patchwork Tue Feb 5 15:55:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [4/8] Revert "Add ptest for glib." Date: Tue, 05 Feb 2013 15:55:44 -0000 From: Bernhard Reutner-Fischer X-Patchwork-Id: 44113 Message-Id: <3666e39a359b03ba1e054813f4353ddeed11d506.1360079373.git.rep.dot.nop@gmail.com> To: openembedded-core@lists.openembedded.org This reverts commit dec6f912d68f52748f645b6af411f189cf464f85. This breaks core-image-sato-sdk for TCLIBC="uclibc". Signed-off-by: Bernhard Reutner-Fischer --- .../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 -------------------- meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 3 - meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb | 22 ------- 3 files changed, 86 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/run-ptest diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch b/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch deleted file mode 100644 index cb36c09..0000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch +++ /dev/null @@ -1,61 +0,0 @@ -Add 'ptest' target to Makefile, to run tests without checking dependencies. -Add 'install-ptest' target, to copy needed files to ptest dir. - -Signed-off-by: Björn Stenberg -Upstream-status: Pending ---- - Makefile.decl | 43 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 43 insertions(+) - ---- a/Makefile.decl 2012-03-12 01:42:39.000000000 +0100 -+++ b/Makefile.decl 2012-11-26 13:42:08.436865192 +0100 -@@ -25,6 +25,49 @@ - test-nonrecursive: - endif - -+ptest: ptest-nonrecursive -+ @ for subdir in $(SUBDIRS) .; do \ -+ test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \ -+ ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \ -+ done -+ -+ptest-nonrecursive: -+ @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS} -+ -+install-ptest: install-ptest-nonrecursive -+ @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \ -+ test "$$subdir" == "." || \ -+ (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \ -+ done -+ -+# install files used for ptest: -+# - copy EXTRA_DIST (for test data in glib/tests) -+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups) -+# - copy TEST_PROGS (the test programs) -+# - copy INSTALL_PROGS (for glib/gtester) -+# - avoid libtool wrappers by copying binaries from .libs -+# - strip Makefile: target from all Makefiles -+install-ptest-nonrecursive: -+ @mkdir -p $(DESTDIR) -+ @if [ -n "${TEST_PROGS}" ]; then \ -+ if [ -n "${EXTRA_DIST}" ]; then \ -+ cp ${EXTRA_DIST} $(DESTDIR); \ -+ fi; \ -+ grep -q dist-hook: Makefile && \ -+ $(MAKE) distdir=$(DESTDIR) dist-hook; \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${TEST_PROGS} $(DESTDIR); \ -+ fi; -+ @if [ -n "${INSTALL_PROGS}" ]; then \ -+ if [ -d .libs ] ; then \ -+ cd .libs; \ -+ fi; \ -+ cp ${INSTALL_PROGS} $(DESTDIR); \ -+ fi -+ @test -f Makefile && sed 's/^Makefile:/_Makefile:/' $(DESTDIR)/Makefile -+ - # test-report: run tests in subdirs and generate report - # perf-report: run tests in subdirs with -m perf and generate report - # full-report: like test-report: with -m perf and -m slow diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest deleted file mode 100644 index 3deb586..0000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -make -k ptest diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb index e1d44e2..e4293c8 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.3.bb @@ -13,8 +13,6 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://configure-libtool.patch \ file://glib-2.0_fix_for_x32.patch \ file://obsolete_automake_macros.patch \ - file://Makefile-ptest.patch \ - file://run-ptest \ " SRC_URI[md5sum] = "a4ca31e258273c3761e3de2edd607661" SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7" @@ -22,24 +20,6 @@ SRC_URI[sha256sum] = "855fcbf87cb93065b488358e351774d8a39177281023bae58c286f4161 SRC_URI_append_class-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk" -RDEPENDS_${PN}-ptest += "\ - eglibc-gconv-utf-16 \ - eglibc-charmap-utf-8 \ - eglibc-gconv-cp1255 \ - eglibc-charmap-cp1255 \ - eglibc-gconv-utf-32 \ - eglibc-gconv-utf-7 \ - eglibc-charmap-invariant \ - eglibc-localedata-translit-cjk-variants \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - python-pygobject \ - python-dbus \ - " - do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in } @@ -56,6 +36,4 @@ do_install_append() { if [ -f ${D}${bindir}/glib-mkenums ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums fi - - ptest_do_install }