From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7BA52138202 for ; Fri, 30 Nov 2012 04:49:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B80921C045; Fri, 30 Nov 2012 04:49:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0EBC21C023 for ; Fri, 30 Nov 2012 04:49:33 +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 98DCE33D976 for ; Fri, 30 Nov 2012 04:49:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 12CDAE5444 for ; Fri, 30 Nov 2012 04:49:31 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1354250832.824b1a28d43b664a70fac0ed4bc555b1c9370eba.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: net-misc/csync/files/, net-misc/csync/ X-VCS-Repository: proj/kde X-VCS-Files: net-misc/csync/csync-0.60.2.ebuild net-misc/csync/files/csync-0.60.2-removebadtest.patch X-VCS-Directories: net-misc/csync/files/ net-misc/csync/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 824b1a28d43b664a70fac0ed4bc555b1c9370eba X-VCS-Branch: master Date: Fri, 30 Nov 2012 04:49:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 576eff38-4069-4db4-9e74-54e4dfbd0e6f X-Archives-Hash: f4bfcd7b84102c45aa7ef5868c2dcd13 commit: 824b1a28d43b664a70fac0ed4bc555b1c9370eba Author: Chris Reffett gentoo org> AuthorDate: Fri Nov 30 04:47:12 2012 +0000 Commit: Chris Reffett gmail com> CommitDate: Fri Nov 30 04:47:12 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=824b1a28 [net-misc/csync] Unrestrict tests with addition of cmocka. Add patch to remove one bad test. Package-Manager: portage-2.2.0_alpha142 --- net-misc/csync/csync-0.60.2.ebuild | 9 ++------- .../csync/files/csync-0.60.2-removebadtest.patch | 9 +++++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/net-misc/csync/csync-0.60.2.ebuild b/net-misc/csync/csync-0.60.2.ebuild index 4e9f5b8..d94e409 100644 --- a/net-misc/csync/csync-0.60.2.ebuild +++ b/net-misc/csync/csync-0.60.2.ebuild @@ -27,13 +27,12 @@ RDEPEND=" DEPEND="${DEPEND} app-text/asciidoc doc? ( app-doc/doxygen ) + test? ( dev-util/cmocka ) " -RESTRICT="test" -#until we have an ebuild for cmocka at least - PATCHES=( "${FILESDIR}/${PN}-0.60.2-automagicness.patch" + "${FILESDIR}/${PN}-0.60.2-removebadtest.patch" ) S="${WORKDIR}/o${P}" @@ -47,10 +46,6 @@ src_prepare() { CMakeLists.txt || die fi - # punt owncloud test as it uses weird cmocka framework - sed -i \ - -e 's:add_subdirectory(ownCloud)::' \ - tests/CMakeLists.txt || die # proper docdir sed -i \ -e "s:/doc/ocsync:/doc/${PF}:" \ diff --git a/net-misc/csync/files/csync-0.60.2-removebadtest.patch b/net-misc/csync/files/csync-0.60.2-removebadtest.patch new file mode 100644 index 0000000..5b8a3a6 --- /dev/null +++ b/net-misc/csync/files/csync-0.60.2-removebadtest.patch @@ -0,0 +1,9 @@ +--- a/tests/vio_tests/check_vio.c ++++ b/tests/vio_tests/check_vio.c +@@ -505,7 +505,6 @@ + unit_test_setup_teardown(check_csync_vio_mkdirs_some_exist, setup_dir, teardown), + unit_test_setup_teardown(check_csync_vio_rmdir, setup, teardown), + unit_test_setup_teardown(check_csync_vio_opendir, setup_dir, teardown), +- unit_test_setup_teardown(check_csync_vio_opendir_perm, setup, teardown), + unit_test(check_csync_vio_closedir_null), + unit_test_setup_teardown(check_csync_vio_readdir, setup_dir, teardown),