diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2010-10-16 13:04:51 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2010-10-16 13:04:51 +0000 |
| commit | e9f9081eaafb7c01a0ae9967a857ec96d4b95acc (patch) | |
| tree | 9d72775f42dfdc8c9f55ab541b3f0d37bf8ebd48 /dev-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-e9f9081eaafb7c01a0ae9967a857ec96d4b95acc.tar.gz gentoo-2-e9f9081eaafb7c01a0ae9967a857ec96d4b95acc.tar.bz2 gentoo-2-e9f9081eaafb7c01a0ae9967a857ec96d4b95acc.zip | |
Disable functional tests that require network connection and rely on 3rd party external server (bug #341267).
(Portage version: 2.2_rc97/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/qoauth/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch | 20 | ||||
| -rw-r--r-- | dev-libs/qoauth/qoauth-1.0.1.ebuild | 10 |
3 files changed, 31 insertions, 6 deletions
diff --git a/dev-libs/qoauth/ChangeLog b/dev-libs/qoauth/ChangeLog index 54c84e77005f..813d8e5a8945 100644 --- a/dev-libs/qoauth/ChangeLog +++ b/dev-libs/qoauth/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/qoauth # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.9 2010/10/16 10:19:51 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/ChangeLog,v 1.10 2010/10/16 13:04:51 ayoy Exp $ + + 16 Oct 2010; Dominik Kapusta <ayoy@gentoo.org> qoauth-1.0.1.ebuild, + +files/qoauth-1.0.1-disable-ft.patch: + Disable functional tests that require network connection and rely on + 3rd party external server (bug #341267). 16 Oct 2010; Dominik Kapusta <ayoy@gentoo.org> qoauth-1.0.1.ebuild: Adding x11-libs/qt-test conditional dependency to compile and run tests diff --git a/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch b/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch new file mode 100644 index 000000000000..1fd6fd0fc8c9 --- /dev/null +++ b/dev-libs/qoauth/files/qoauth-1.0.1-disable-ft.patch @@ -0,0 +1,20 @@ +diff --git a/qoauth.pro b/qoauth.pro +index f09b3be..27d7bb3 100644 +--- a/qoauth.pro ++++ b/qoauth.pro +@@ -5,6 +5,6 @@ SUBDIRS += src tests + CONFIG += ordered + + check.target = check +-check.commands = ( cd tests/ut_interface && ./ut_interface ) && ( cd tests/ft_interface && ./ft_interface ) ++check.commands = ( cd tests/ut_interface && ./ut_interface ) + check.depends = sub-tests + QMAKE_EXTRA_TARGETS += check +diff --git a/tests/tests.pro b/tests/tests.pro +index d582750..e010bb0 100644 +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -1,2 +1,2 @@ + TEMPLATE = subdirs +-SUBDIRS += ut_interface ft_interface ++SUBDIRS += ut_interface diff --git a/dev-libs/qoauth/qoauth-1.0.1.ebuild b/dev-libs/qoauth/qoauth-1.0.1.ebuild index cc5f19a2f04a..5c69bef039aa 100644 --- a/dev-libs/qoauth/qoauth-1.0.1.ebuild +++ b/dev-libs/qoauth/qoauth-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.2 2010/10/16 10:19:51 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qoauth/qoauth-1.0.1.ebuild,v 1.3 2010/10/16 13:04:51 ayoy Exp $ EAPI="2" @@ -25,16 +25,16 @@ RDEPEND="${COMMON_DEPEND} S="${WORKDIR}/${P}-src" src_prepare() { + # disable functional tests that require network connection and rely + # on 3rd party external server (bug #341267) + epatch "${FILESDIR}/${P}-disable-ft.patch" + sed -i -e '/^ *docs \\$/d' \ -e '/^ *build_all \\$/d' \ -e 's/^\#\(!macx\)/\1/' \ src/src.pro || die "sed failed" sed -i -e "s/\(.*\)lib$/\1$(get_libdir)/" src/pcfile.sh || die "sed failed" - - if ! use test; then - sed -i -e 's/^\(SUBDIRS.*\) tests/\1/' ${PN}.pro || die "sed failed" - fi } src_compile() { |