From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SPLPP-0001v2-82 for garchives@archives.gentoo.org; Tue, 01 May 2012 22:19:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1273E0AA2; Tue, 1 May 2012 22:18:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 742F7E0AA2 for ; Tue, 1 May 2012 22:18:50 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9EAE61B4027 for ; Tue, 1 May 2012 22:18:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 60BFEE5403 for ; Tue, 1 May 2012 22:18:48 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1335910585.a9d026ede38de3254565a5fa62c09b14746571e3.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/ X-VCS-Repository: proj/kde X-VCS-Files: dev-util/cmake/cmake-2.8.8.ebuild dev-util/cmake/files/cmake-2.8.8-tests.patch X-VCS-Directories: dev-util/cmake/files/ dev-util/cmake/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: a9d026ede38de3254565a5fa62c09b14746571e3 X-VCS-Branch: master Date: Tue, 1 May 2012 22:18:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: d44269a0-e760-42e9-809f-736a3e77d4e1 X-Archives-Hash: 7588bf5bbebb0f06d9c24c3a018a0187 commit: a9d026ede38de3254565a5fa62c09b14746571e3 Author: Chris Reffett gmail com> AuthorDate: Tue May 1 22:16:25 2012 +0000 Commit: Chris Reffett gmail com> CommitDate: Tue May 1 22:16:25 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Da9d026ed [dev-util/cmake] Added patch to remove failing tests, removed RESTRICT --- dev-util/cmake/cmake-2.8.8.ebuild | 4 +- dev-util/cmake/files/cmake-2.8.8-tests.patch | 58 ++++++++++++++++++++= ++++++ 2 files changed, 59 insertions(+), 3 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8= .8.ebuild index 11db0c4..1386340 100644 --- a/dev-util/cmake/cmake-2.8.8.ebuild +++ b/dev-util/cmake/cmake-2.8.8.ebuild @@ -18,9 +18,6 @@ KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~= ppc64 ~s390 ~sh ~sparc ~x86 SLOT=3D"0" IUSE=3D"emacs ncurses qt4 vim-syntax" =20 -#Test 62 wiped out /usr/local/, restricting until that's fixed -RESTRICT=3D"test" - DEPEND=3D" >=3Dapp-arch/libarchive-2.8.0 >=3Dnet-misc/curl-7.20.0-r1[ssl] @@ -62,6 +59,7 @@ PATCHES=3D( "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch "${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch + "${FILESDIR}"/${PN}-2.8.8-tests.patch ) cmake_src_bootstrap() { # Cleanup args to extract only JOBS. diff --git a/dev-util/cmake/files/cmake-2.8.8-tests.patch b/dev-util/cmak= e/files/cmake-2.8.8-tests.patch new file mode 100644 index 0000000..64af9d3 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.8-tests.patch @@ -0,0 +1,58 @@ +Remove DeployQt4 test, which tries to break sandbox and ignores prefix, = and CTest.updatecvs, which fails to commit as root +--- cmake-2.8.8/Tests/CMakeLists.txt ++++ cmake-2.8.8/Tests/CMakeLists.txt +@@ -273,23 +273,6 @@ + ) + LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilit= ies") +=20 +- # run test for DeployQt4 on supported platforms/compilers (which de= pends on BundleUtilities) +- # this test also depends on the existence of the standard qtiff plu= gin +- if(QT4_WORKS AND QT_QTSQL_FOUND) +- ADD_TEST(Qt4Deploy ${CMAKE_CTEST_COMMAND} +- --build-and-test +- "${CMake_SOURCE_DIR}/Tests/Qt4Deploy" +- "${CMake_BINARY_DIR}/Tests/Qt4Deploy" +- --build-generator ${CMAKE_TEST_GENERATOR} +- --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} +- --build-project Qt4Deploy +- --build-options +- -DCMAKE_BUILD_TYPE:STRING=3D${CMAKE_BUILD_TYPE} +- -DQT_QMAKE_EXECUTABLE:FILEPATH=3D${QT_QMAKE_EXECUTABLE} +- ) +- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Deploy"= ) +- endif() +- + endif() + endif() +=20 +@@ -1548,30 +1531,6 @@ + LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpd= ateSVN_DIR}") + ENDIF(Subversion_FOUND) +=20 +- # Test CTest Update with CVS +- IF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) +- FIND_PACKAGE(CVS QUIET) +- ELSE(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) +- FIND_PROGRAM(CVS_EXECUTABLE NAMES cvs) +- SET(CVS_FOUND ${CVS_EXECUTABLE}) +- ENDIF(EXISTS ${CMAKE_ROOT}/Modules/FindCVS.cmake) +- SET(CTEST_TEST_UPDATE_CVS ${CVS_FOUND}) +- IF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) +- IF("${CVS_EXECUTABLE}" MATCHES "cygwin") +- MESSAGE(STATUS "No CTest.UpdateCVS test with cygwin cvs.exe out= side cygwin!") +- SET(CTEST_TEST_UPDATE_CVS 0) +- ENDIF("${CVS_EXECUTABLE}" MATCHES "cygwin") +- ENDIF(CTEST_TEST_UPDATE_CVS AND NOT UNIX) +- IF(CTEST_TEST_UPDATE_CVS) +- SET(CTestUpdateCVS_DIR "CTest UpdateCVS") +- CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestUpdateCVS.cmake.in= " +- "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" @ONLY) +- ADD_TEST(CTest.UpdateCVS ${CMAKE_CMAKE_COMMAND} +- -P "${CMake_BINARY_DIR}/Tests/CTestUpdateCVS.cmake" +- ) +- LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpd= ateCVS_DIR}") +- ENDIF(CTEST_TEST_UPDATE_CVS) +- + # Test CTest Update with BZR + FIND_PROGRAM(BZR_EXECUTABLE NAMES bzr) + MARK_AS_ADVANCED(BZR_EXECUTABLE)