diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-09-16 14:18:43 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-09-16 14:18:43 +0000 |
| commit | 98c787b7a9c46f2bbd1af8794c22be0578ab5545 (patch) | |
| tree | c3afaa8bc1ee4a66a0b77cf655a3eb9f3d1597a4 /eclass | |
| parent | fix dependencies wrt #522942 (diff) | |
| download | gentoo-2-98c787b7a9c46f2bbd1af8794c22be0578ab5545.tar.gz gentoo-2-98c787b7a9c46f2bbd1af8794c22be0578ab5545.tar.bz2 gentoo-2-98c787b7a9c46f2bbd1af8794c22be0578ab5545.zip | |
Exclude installed_cmake tests as well.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/qt5-build.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8d65307249bb..d01b2ea76e12 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1369 2014/09/15 17:54:11 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1370 2014/09/16 14:18:43 pesa Exp $ + + 16 Sep 2014; Davide Pesavento <pesa@gentoo.org> qt5-build.eclass: + Exclude installed_cmake tests as well. 15 Sep 2014; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass: Allow RPMS specified as array diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 5c1397f8e747..cb0a20166eaa 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.5 2014/09/11 00:08:57 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.6 2014/09/16 14:18:43 pesa Exp $ # @ECLASS: qt5-build.eclass # @MAINTAINER: @@ -225,8 +225,8 @@ qt5-build_src_compile() { qt5-build_src_test() { echo ">>> Test phase [QtTest]: ${CATEGORY}/${PF}" - # '-after SUBDIRS-=cmake' disables broken tests - bug #474004 - qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake + # '-after SUBDIRS-=...' disables broken cmake tests (bug 474004) + qt5_foreach_target_subdir qt5_qmake -after SUBDIRS-=cmake SUBDIRS-=installed_cmake qt5_foreach_target_subdir emake # create a custom testrunner script that correctly sets |