[patch] Build tests in ${T}/tests

dbus_out_of_tree_tests.patch (text/plain), 2.60 KB, created by Nirbheek Chauhan (RETIRED) on 2009-10-18 12:34:41 UTC

--- dbus-1.3.0.ebuild
+++ dbus-1.3.0-r1.ebuild
@@ -35,6 +35,14 @@
 	# required for asneeded patch but also for bug 263909, cross-compile so
 	# don't remove eautoreconf
 	eautoreconf
+
+	# Copy the prepared source tree to a separate location
+	# for running tests later
+	if use test; then
+		ebegin "Copying source tree to \${T}/tests"
+		cp -a "${S}" "${T}/tests" || die "copying sources for tests failed"
+		eend
+	fi
 }
 
 src_compile() {
@@ -43,25 +51,25 @@
 
 	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
 	# not on an SELinux profile.
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable selinux libaudit)	\
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug asserts) \
-		$(use_enable test tests) \
-		$(use_enable test asserts) \
-		--with-xml=expat \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/run/dbus/system_bus_socket \
-		--with-session-socket-dir=/tmp \
-		--with-dbus-user=messagebus \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		|| die "econf failed"
+	ECONF="
+		$(use_with X x)
+		$(use_enable kernel_linux inotify)
+		$(use_enable kernel_FreeBSD kqueue)
+		$(use_enable selinux)
+		$(use_enable selinux libaudit)
+		$(use_enable debug verbose-mode)
+		$(use_enable debug asserts)
+		--disable-tests
+		--with-xml=expat
+		--with-system-pid-file=/var/run/dbus.pid
+		--with-system-socket=/var/run/dbus/system_bus_socket
+		--with-session-socket-dir=/tmp
+		--with-dbus-user=messagebus
+		--localstatedir=/var
+		$(use_enable doc doxygen-docs)
+		--disable-xml-docs"
+		
+	econf ${ECONF} || die "econf failed"
 
 	# after the compile, it uses a selinuxfs interface to
 	# check if the SELinux policy has the right support
@@ -71,6 +79,20 @@
 }
 
 src_test() {
+	# We need to build in a separate tree for the tests because 
+	# having unit tests enabled results in an insecure library
+	cd "${T}/tests" || die "cd tests failed"
+
+	einfo "Configuring a separate tree for building tests"
+	econf ${ECONF} \
+		$(use_enable test tests) \
+		$(use_enable test asserts) \
+		|| die "test econf failed"
+
+	einfo "Building tests"
+	emake || die "test make failed"
+
+	einfo "Running tests"
 	DBUS_VERBOSE=1 make check || die "make check failed"
 }
 
@@ -130,10 +152,4 @@
 		ewarn "restarting the dbus service WILL restart X as well"
 		ebeep 5
 	fi
-
-	if use test; then
-		elog
-		ewarn "You have unit tests enabled, this results in an insecure library"
-		ewarn "It is recommended that you reinstall *without* FEATURES=test"
-	fi
 }