summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-10-18 13:40:35 +0000
committerPeter Volkov <pva@gentoo.org>2008-10-18 13:40:35 +0000
commit5eeb7c972ee055a275f38830265ffae58ece61af (patch)
tree99cf93d9e46f3c44fa707b667e04fda32bb76860 /dev-util
parentstable ppc64, bug 242396 (diff)
downloadgentoo-2-5eeb7c972ee055a275f38830265ffae58ece61af.tar.gz
gentoo-2-5eeb7c972ee055a275f38830265ffae58ece61af.tar.bz2
gentoo-2-5eeb7c972ee055a275f38830265ffae58ece61af.zip
Fixed run of test suit, fix was taken from unofficial bazaar overlay. Thank Mark Lee for this work.
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-openvz.git-777e816 i686)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/bzrtools/ChangeLog7
-rw-r--r--dev-util/bzrtools/bzrtools-1.6.0.ebuild15
-rw-r--r--dev-util/bzrtools/bzrtools-1.7.0.ebuild15
-rw-r--r--dev-util/bzrtools/bzrtools-1.8.0.ebuild15
4 files changed, 45 insertions, 7 deletions
diff --git a/dev-util/bzrtools/ChangeLog b/dev-util/bzrtools/ChangeLog
index 63997ba370df..4c53f3737916 100644
--- a/dev-util/bzrtools/ChangeLog
+++ b/dev-util/bzrtools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-util/bzrtools
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.35 2008/10/07 20:08:53 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/ChangeLog,v 1.36 2008/10/18 13:40:35 pva Exp $
+
+ 18 Oct 2008; Peter Volkov <pva@gentoo.org> bzrtools-1.6.0.ebuild,
+ bzrtools-1.7.0.ebuild, bzrtools-1.8.0.ebuild:
+ Fixed run of test suit, fix was taken from unofficial bazaar overlay.
+ Thank Mark Lee for this work.
*bzrtools-1.8.0 (07 Oct 2008)
diff --git a/dev-util/bzrtools/bzrtools-1.6.0.ebuild b/dev-util/bzrtools/bzrtools-1.6.0.ebuild
index e16b338afc9a..433fece2df35 100644
--- a/dev-util/bzrtools/bzrtools-1.6.0.ebuild
+++ b/dev-util/bzrtools/bzrtools-1.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.6.0.ebuild,v 1.1 2008/08/26 17:55:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.6.0.ebuild,v 1.2 2008/10/18 13:40:35 pva Exp $
NEED_PYTHON=2.4
inherit distutils versionator
@@ -23,6 +23,17 @@ S=${WORKDIR}/${PN}
PYTHON_MODNAME=bzrlib
src_test() {
+ python_version
einfo "Running testsuite..."
- "${S}"/test.py || die "Testsuite failed."
+ # put a linked copy of the bzr core into the build directory to properly
+ # test the "built" version of bzrtools
+ find "$(python_get_libdir)/site-packages/bzrlib/" \
+ -mindepth 1 -maxdepth 1 \
+ \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \
+ -exec ln -s '{}' "${S}/build/lib/bzrlib/" \;
+ touch "${S}/build/lib/bzrlib/plugins/__init__.py"
+ "${S}/test.py" "${S}/build/lib" || die "Testsuite failed."
+ # remove the "shadow" copy so it doesn't get installed
+ rm "${S}/build/lib/bzrlib/plugins/__init__.py"
+ find "${S}/build/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm '{}' \;
}
diff --git a/dev-util/bzrtools/bzrtools-1.7.0.ebuild b/dev-util/bzrtools/bzrtools-1.7.0.ebuild
index 4d3cc80ea9ab..3207e1804612 100644
--- a/dev-util/bzrtools/bzrtools-1.7.0.ebuild
+++ b/dev-util/bzrtools/bzrtools-1.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.7.0.ebuild,v 1.1 2008/09/15 14:02:43 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.7.0.ebuild,v 1.2 2008/10/18 13:40:35 pva Exp $
NEED_PYTHON=2.4
inherit distutils versionator
@@ -23,6 +23,17 @@ S=${WORKDIR}/${PN}
PYTHON_MODNAME=bzrlib
src_test() {
+ python_version
einfo "Running testsuite..."
- "${S}"/test.py || die "Testsuite failed."
+ # put a linked copy of the bzr core into the build directory to properly
+ # test the "built" version of bzrtools
+ find "$(python_get_libdir)/site-packages/bzrlib/" \
+ -mindepth 1 -maxdepth 1 \
+ \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \
+ -exec ln -s '{}' "${S}/build/lib/bzrlib/" \;
+ touch "${S}/build/lib/bzrlib/plugins/__init__.py"
+ "${S}/test.py" "${S}/build/lib" || die "Testsuite failed."
+ # remove the "shadow" copy so it doesn't get installed
+ rm "${S}/build/lib/bzrlib/plugins/__init__.py"
+ find "${S}/build/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm '{}' \;
}
diff --git a/dev-util/bzrtools/bzrtools-1.8.0.ebuild b/dev-util/bzrtools/bzrtools-1.8.0.ebuild
index 9a876ebacc9d..b94a7c55b4f4 100644
--- a/dev-util/bzrtools/bzrtools-1.8.0.ebuild
+++ b/dev-util/bzrtools/bzrtools-1.8.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.8.0.ebuild,v 1.1 2008/10/07 20:08:53 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzrtools/bzrtools-1.8.0.ebuild,v 1.2 2008/10/18 13:40:35 pva Exp $
NEED_PYTHON=2.4
inherit distutils versionator
@@ -23,6 +23,17 @@ S=${WORKDIR}/${PN}
PYTHON_MODNAME=bzrlib
src_test() {
+ python_version
einfo "Running testsuite..."
- "${S}"/test.py || die "Testsuite failed."
+ # put a linked copy of the bzr core into the build directory to properly
+ # test the "built" version of bzrtools
+ find "$(python_get_libdir)/site-packages/bzrlib/" \
+ -mindepth 1 -maxdepth 1 \
+ \( \( -type d -and -not -name "plugins" \) -or -name "*.py" \) \
+ -exec ln -s '{}' "${S}/build/lib/bzrlib/" \;
+ touch "${S}/build/lib/bzrlib/plugins/__init__.py"
+ "${S}/test.py" "${S}/build/lib" || die "Testsuite failed."
+ # remove the "shadow" copy so it doesn't get installed
+ rm "${S}/build/lib/bzrlib/plugins/__init__.py"
+ find "${S}/build/lib/bzrlib/" -mindepth 1 -maxdepth 1 -type l -exec rm '{}' \;
}