Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/Ice] messed with tests, revert to old python handling

Browse Source
This commit is contained in:
Robert Förster 2016-10-12 19:06:53 +02:00
parent cc403dd79c
commit 8f23c0edab
2 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dev-libs/Ice/Ice-3.6.3.ebuild
View File

@ -99,20 +99,26 @@ src_prepare() {
csharp/config/Make.rules.cs || die "sed failed" csharp/config/Make.rules.cs || die "sed failed"
# skip mono tests, bug #498484 # skip mono tests, bug #498484
# sed -i \ sed -i \
# -e '/SUBDIRS/s|\ test||' \ -e '/SUBDIRS/s|\ test||' \
# csharp/Makefile || die "sed failed" csharp/Makefile || die "sed failed"
# skip udp test due to multicast # skip udp test due to multicast
# skip IceSSL tests due to requirement of internet connection # skip IceSSL tests due to requirement of internet connection
# sed -i \ # IceUtil/stacktrace fails
# -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/simple|' \ sed -i \
# cpp/Makefile || die "sed failed" -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files # mainly broken .ice files
# sed -i \ sed -i \
# -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \ -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
# python/Makefile || die "sed failed" python/Makefile || die "sed failed"
# fails even on unicode locale
sed -i \
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
ruby/Makefile || die "sed failed"
} }
suitable_db_version() { suitable_db_version() {
@ -152,6 +158,9 @@ src_configure() {
if use python ; then if use python ; then
S=${S}/python python_copy_sources S=${S}/python python_copy_sources
# make a place for the build hackery
rm -r "${WORKDIR}/${P/I/i}"/python || die
fi fi
if use ruby ; then if use ruby ; then
@ -212,9 +221,11 @@ src_compile() {
if use python ; then if use python ; then
building() { building() {
# build requires that the directory is named 'python' # build requires that the directory is named 'python'
emake -C python ${MAKE_RULES} || die "emake python-${EPYTHON} failed" mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl building BUILD_DIR=python python_foreach_impl building
fi fi
if use ruby ; then if use ruby ; then
@ -234,12 +245,14 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
emake -C python ${MAKE_RULES} \ mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl testing BUILD_DIR=python python_foreach_impl testing
fi fi
if use ruby ; then if use ruby ; then
@ -293,12 +306,14 @@ src_install() {
installation() { installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die mkdir -p "${D}/$(python_get_sitedir)" || die
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} \ emake -C python ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed" install || die "emake python-${EPYTHON} install failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl installation BUILD_DIR=python python_foreach_impl installation
fi fi
if use ruby ; then if use ruby ; then

45
dev-libs/Ice/Ice-3.6.9999.ebuild
View File

@ -4,7 +4,7 @@
EAPI=5 EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) PYTHON_COMPAT=( python{2_7,3_5} pypy )
RUBY_OPTIONAL="yes" RUBY_OPTIONAL="yes"
USE_RUBY="ruby23" USE_RUBY="ruby23"
@ -104,20 +104,26 @@ src_prepare() {
csharp/config/Make.rules.cs || die "sed failed" csharp/config/Make.rules.cs || die "sed failed"
# skip mono tests, bug #498484 # skip mono tests, bug #498484
# sed -i \ sed -i \
# -e '/SUBDIRS/s|\ test||' \ -e '/SUBDIRS/s|\ test||' \
# csharp/Makefile || die "sed failed" csharp/Makefile || die "sed failed"
# skip udp test due to multicast # skip udp test due to multicast
# skip IceSSL tests due to requirement of internet connection # skip IceSSL tests due to requirement of internet connection
# sed -i \ # IceUtil/stacktrace fails
# -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/simple|' \ sed -i \
# cpp/Makefile || die "sed failed" -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files # mainly broken .ice files
# sed -i \ sed -i \
# -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \ -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
# python/Makefile || die "sed failed" python/Makefile || die "sed failed"
# fails even on unicode locale
sed -i \
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
ruby/Makefile || die "sed failed"
} }
suitable_db_version() { suitable_db_version() {
@ -157,6 +163,9 @@ src_configure() {
if use python ; then if use python ; then
S=${S}/python python_copy_sources S=${S}/python python_copy_sources
# make a place for the build hackery
rm -r "${WORKDIR}/${PN}"/python || die
fi fi
if use ruby ; then if use ruby ; then
@ -217,9 +226,11 @@ src_compile() {
if use python ; then if use python ; then
building() { building() {
# build requires that the directory is named 'python' # build requires that the directory is named 'python'
emake -C python ${MAKE_RULES} || die "emake python-${EPYTHON} failed" mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl building BUILD_DIR=python python_foreach_impl building
fi fi
if use ruby ; then if use ruby ; then
@ -239,12 +250,14 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
emake -C python ${MAKE_RULES} \ mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} PYTHON=${EPYTHON} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl testing BUILD_DIR=python python_foreach_impl testing
fi fi
if use ruby ; then if use ruby ; then
@ -294,12 +307,14 @@ src_install() {
installation() { installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die mkdir -p "${D}/$(python_get_sitedir)" || die
mv "${BUILD_DIR}" "${S}"/python || die
emake -C python ${MAKE_RULES} \ emake -C python ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed" install || die "emake python-${EPYTHON} install failed"
mv "${S}"/python "${BUILD_DIR}"
} }
python_foreach_impl installation BUILD_DIR=python python_foreach_impl installation
fi fi
if use ruby ; then if use ruby ; then