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

[Tomas Chvatal (scarabeus)]

scarabeus    11/04/27 16:54:44

  Modified:             cmake-utils.eclass
  Log:
  Rather inform that we have no tests instead of printing help for ctest.

Revision  Changes    Path
1.68                 eclass/cmake-utils.eclass

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

Index: cmake-utils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- cmake-utils.eclass	18 Mar 2011 19:45:49 -0000	1.67
+++ cmake-utils.eclass	27 Apr 2011 16:54:44 -0000	1.68
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.67 2011/03/18 19:45:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/cmake-utils.eclass,v 1.68 2011/04/27 16:54:44 scarabeus Exp $
 
 # @ECLASS: cmake-utils.eclass
 # @MAINTAINER:
@@ -411,10 +411,12 @@
 
 enable_cmake-utils_src_test() {
 	debug-print-function ${FUNCNAME} "$@"
+	local ctestargs
 
 	_check_build_dir
 	pushd "${CMAKE_BUILD_DIR}" > /dev/null
-	local ctestargs
+	[[ -e CTestTestfile.cmake ]] || { echo "No tests found. Skipping."; return 0 ; }
+
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
 	ctest ${ctestargs} "$@" || die "Tests failed."
 	popd > /dev/null