[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cmake-utils.eclass virtualx.eclass

[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog cmake-utils.eclass virtualx.eclass

[Michael Palimaka (kensington)]

kensington    12/10/02 08:14:36

  Modified:             ChangeLog cmake-utils.eclass virtualx.eclass
  Log:
  Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status at the end of CMake test phase. This fixes bug #406353.

Revision  Changes    Path
1.424                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.424&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.424&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.423&r2=1.424

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -r1.423 -r1.424
--- ChangeLog	2 Oct 2012 01:22:57 -0000	1.423
+++ ChangeLog	2 Oct 2012 08:14:36 -0000	1.424
@@ -1,6 +1,11 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.423 2012/10/02 01:22:57 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.424 2012/10/02 08:14:36 kensington Exp $
+
+  02 Oct 2012; Michael Palimaka <kensington@gentoo.org> cmake-utils.eclass,
+  virtualx.eclass:
+  Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status
+  at the end of CMake test phase. This fixes bug #406353.
 
   02 Oct 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
   Add 3.3 as a supported python abi for testing.



1.83                 eclass/cmake-utils.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.83&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.83&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.82&r2=1.83

Index: cmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- cmake-utils.eclass	27 Sep 2012 16:35:41 -0000	1.82
+++ cmake-utils.eclass	2 Oct 2012 08:14:36 -0000	1.83
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.82 2012/09/27 16:35:41 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.83 2012/10/02 08:14:36 kensington Exp $
 
 # @ECLASS: cmake-utils.eclass
 # @MAINTAINER:
@@ -472,6 +472,8 @@
 
 	if ctest ${ctestargs} "$@" ; then
 		einfo "Tests succeeded."
+		popd > /dev/null
+		return 0
 	else
 		if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then
 			# on request from Diego
@@ -483,8 +485,11 @@
 		else
 			die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log"
 		fi
+
+		# die might not die due to nonfatal
+		popd > /dev/null
+		return 1
 	fi
-	popd > /dev/null
 }
 
 # @FUNCTION: cmake-utils_src_configure



1.42                 eclass/virtualx.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.41&r2=1.42

Index: virtualx.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- virtualx.eclass	29 Sep 2012 20:48:58 -0000	1.41
+++ virtualx.eclass	2 Oct 2012 08:14:36 -0000	1.42
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.41 2012/09/29 20:48:58 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.42 2012/10/02 08:14:36 kensington Exp $
 
 # @ECLASS: virtualx.eclass
 # @MAINTAINER:
@@ -144,7 +144,7 @@
 		# Do not break on error, but setup $retval, as we need
 		# to kill Xvfb
 		debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\""
-		${VIRTUALX_COMMAND} "$@"
+		nonfatal ${VIRTUALX_COMMAND} "$@"
 		retval=$?
 
 		# Now kill Xvfb