Fix tests, bug 330051

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 108 insertions, 3 deletions

diff --git a/dev-util/kdevelop-php/ChangeLog b/dev-util/kdevelop-php/ChangeLog
index e4f47522ec62..fd5b7ccd033c 100644
--- a/dev-util/kdevelop-php/ChangeLog
+++ b/dev-util/kdevelop-php/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdevelop-php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.19 2011/02/25 22:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/ChangeLog,v 1.20 2011/03/05 17:04:33 dilfridge Exp $
+
+  05 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdevelop-php-1.2.0.ebuild, +files/kdevelop-php-1.2.0-dbustests.patch:
+  Fix tests, bug 330051
 
   25 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kdevelop-php-1.0.2.ebuild, kdevelop-php-1.1.2.ebuild,
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
new file mode 100644
index 000000000000..d3bb404c2f6a
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-1.2.0-dbustests.patch
@@ -0,0 +1,98 @@
+diff -ruN kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt kdevelop-php-1.2.0/completion/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/completion/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/completion/tests/CMakeLists.txt	2011-03-05 18:01:34.000000000 +0100
+@@ -8,24 +8,6 @@
+ 
+ set(completiontest_SRCS test_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completiontest ${completiontest_SRCS})
+-target_link_libraries(completiontest
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(completionbench_SRCS bench_completion.cpp
+     ../../duchain/tests/duchaintestbase.cpp)
+-kde4_add_unit_test(completionbenchmark ${completionbench_SRCS})
+-target_link_libraries(completionbenchmark
+-    kdev4phpcompletion
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+diff -ruN kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt
+--- kdevelop-php-1.2.0.orig/duchain/tests/CMakeLists.txt	2011-01-23 20:42:54.000000000 +0100
++++ kdevelop-php-1.2.0/duchain/tests/CMakeLists.txt	2011-03-05 17:54:27.000000000 +0100
+@@ -9,66 +9,21 @@
+ set(duchain_SRCS
+     duchain.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(duchain ${duchain_SRCS})
+-target_link_libraries(duchain
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(expressionparser_SRCS
+     expressionparser.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(expressionparser ${expressionparser_SRCS})
+-target_link_libraries(expressionparser
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(uses_SRCS
+     uses.cpp
+     duchaintestbase.cpp)
+-kde4_add_unit_test(uses ${uses_SRCS})
+-target_link_libraries(uses
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+ 
+ set(benchmarks_SRCS
+     benchmarks.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(benchmarks ${benchmarks_SRCS})
+-target_link_libraries(benchmarks
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
+-
+ 
+ set(duchain_multiplefiles_SRCS
+     duchain_multiplefiles.cpp
+     duchaintestbase.cpp
+ )
+-kde4_add_unit_test(duchain_multiplefiles ${duchain_multiplefiles_SRCS})
+-target_link_libraries(duchain_multiplefiles
+-    kdev4phpduchain
+-    kdev4phpparser
+-    ${QT_QTTEST_LIBRARY}
+-    ${KDEVPLATFORM_INTERFACES_LIBRARIES}
+-    ${KDEVPLATFORM_TESTS_LIBRARIES}
+-    ${KDEVPLATFORM_LANGUAGE_LIBRARIES}
+-)
diff --git a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
index 90f07aeda895..40a33dc46d4c 100644
--- a/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild
@@ -1,17 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.2 2011/02/25 22:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-php/kdevelop-php-1.2.0.ebuild,v 1.3 2011/03/05 17:04:33 dilfridge Exp $
 
 EAPI=3
 
 # Bug 330051
-RESTRICT="test"
+# RESTRICT="test"
 
 KDE_LINGUAS="ca ca@valencia da de en_GB es et fr it nds nl pt pt_BR sv th uk zh_CN zh_TW"
 
 KMNAME="kdevelop"
 KMMODULE="php"
 KDEVELOP_VERSION="4.2.0"
+VIRTUALX_REQUIRED="optional"
 inherit kde4-base
 
 DESCRIPTION="PHP plugin for KDevelop 4"
@@ -27,3 +28,5 @@ RDEPEND="
 	dev-util/kdevelop
 	doc? ( >=dev-util/kdevelop-php-docs-${PV}:${SLOT} )
 "
+
+PATCHES=( "${FILESDIR}/${P}"-dbustests.patch )