| 1 |
kensington 12/10/02 08:14:36 |
| 2 |
|
| 3 |
Modified: ChangeLog cmake-utils.eclass virtualx.eclass |
| 4 |
Log: |
| 5 |
Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status at the end of CMake test phase. This fixes bug #406353. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.424 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.424&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.424&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.423&r2=1.424 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.423 |
| 18 |
retrieving revision 1.424 |
| 19 |
diff -u -r1.423 -r1.424 |
| 20 |
--- ChangeLog 2 Oct 2012 01:22:57 -0000 1.423 |
| 21 |
+++ ChangeLog 2 Oct 2012 08:14:36 -0000 1.424 |
| 22 |
@@ -1,6 +1,11 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.423 2012/10/02 01:22:57 floppym Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.424 2012/10/02 08:14:36 kensington Exp $ |
| 27 |
+ |
| 28 |
+ 02 Oct 2012; Michael Palimaka <kensington@g.o> cmake-utils.eclass, |
| 29 |
+ virtualx.eclass: |
| 30 |
+ Make VIRTUALX_COMMAND nonfatal so that Xvfb is always killed. Return status |
| 31 |
+ at the end of CMake test phase. This fixes bug #406353. |
| 32 |
|
| 33 |
02 Oct 2012; Mike Gilbert <floppym@g.o> python.eclass: |
| 34 |
Add 3.3 as a supported python abi for testing. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.83 eclass/cmake-utils.eclass |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.83&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?rev=1.83&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/cmake-utils.eclass?r1=1.82&r2=1.83 |
| 43 |
|
| 44 |
Index: cmake-utils.eclass |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v |
| 47 |
retrieving revision 1.82 |
| 48 |
retrieving revision 1.83 |
| 49 |
diff -u -r1.82 -r1.83 |
| 50 |
--- cmake-utils.eclass 27 Sep 2012 16:35:41 -0000 1.82 |
| 51 |
+++ cmake-utils.eclass 2 Oct 2012 08:14:36 -0000 1.83 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2012 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.82 2012/09/27 16:35:41 axs Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.83 2012/10/02 08:14:36 kensington Exp $ |
| 57 |
|
| 58 |
# @ECLASS: cmake-utils.eclass |
| 59 |
# @MAINTAINER: |
| 60 |
@@ -472,6 +472,8 @@ |
| 61 |
|
| 62 |
if ctest ${ctestargs} "$@" ; then |
| 63 |
einfo "Tests succeeded." |
| 64 |
+ popd > /dev/null |
| 65 |
+ return 0 |
| 66 |
else |
| 67 |
if [[ -n "${CMAKE_YES_I_WANT_TO_SEE_THE_TEST_LOG}" ]] ; then |
| 68 |
# on request from Diego |
| 69 |
@@ -483,8 +485,11 @@ |
| 70 |
else |
| 71 |
die "Tests failed. When you file a bug, please attach the following file: \n\t${CMAKE_BUILD_DIR}/Testing/Temporary/LastTest.log" |
| 72 |
fi |
| 73 |
+ |
| 74 |
+ # die might not die due to nonfatal |
| 75 |
+ popd > /dev/null |
| 76 |
+ return 1 |
| 77 |
fi |
| 78 |
- popd > /dev/null |
| 79 |
} |
| 80 |
|
| 81 |
# @FUNCTION: cmake-utils_src_configure |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.42 eclass/virtualx.eclass |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.42&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?rev=1.42&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/virtualx.eclass?r1=1.41&r2=1.42 |
| 90 |
|
| 91 |
Index: virtualx.eclass |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v |
| 94 |
retrieving revision 1.41 |
| 95 |
retrieving revision 1.42 |
| 96 |
diff -u -r1.41 -r1.42 |
| 97 |
--- virtualx.eclass 29 Sep 2012 20:48:58 -0000 1.41 |
| 98 |
+++ virtualx.eclass 2 Oct 2012 08:14:36 -0000 1.42 |
| 99 |
@@ -1,6 +1,6 @@ |
| 100 |
# Copyright 1999-2012 Gentoo Foundation |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.41 2012/09/29 20:48:58 chithanh Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/virtualx.eclass,v 1.42 2012/10/02 08:14:36 kensington Exp $ |
| 104 |
|
| 105 |
# @ECLASS: virtualx.eclass |
| 106 |
# @MAINTAINER: |
| 107 |
@@ -144,7 +144,7 @@ |
| 108 |
# Do not break on error, but setup $retval, as we need |
| 109 |
# to kill Xvfb |
| 110 |
debug-print "${FUNCNAME}: ${VIRTUALX_COMMAND} \"$@\"" |
| 111 |
- ${VIRTUALX_COMMAND} "$@" |
| 112 |
+ nonfatal ${VIRTUALX_COMMAND} "$@" |
| 113 |
retval=$? |
| 114 |
|
| 115 |
# Now kill Xvfb |
Archives