From owner-svn-ports-head@freebsd.org Tue Sep 29 22:49:03 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D02A9A0C66A; Tue, 29 Sep 2015 22:49:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFCA115F6; Tue, 29 Sep 2015 22:49:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8TMn3E4022106; Tue, 29 Sep 2015 22:49:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8TMn3wH022101; Tue, 29 Sep 2015 22:49:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201509292249.t8TMn3wH022101@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 29 Sep 2015 22:49:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398189 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-simpleperf X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2015 22:49:04 -0000 Author: jbeich Date: Tue Sep 29 22:49:02 2015 New Revision: 398189 URL: https://svnweb.freebsd.org/changeset/ports/398189 Log: devel/android-tools-*: disable some known-to-fail tests Added: head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile (contents, props changed) head/devel/android-tools-simpleperf/Makefile (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/Makefile Tue Sep 29 21:56:28 2015 (r398188) +++ head/devel/android-tools-adb-devel/Makefile Tue Sep 29 22:49:02 2015 (r398189) @@ -27,8 +27,23 @@ TEST_BUILD_DEPENDS=googletest>=1.6.0:${P TEST_USES= python:2.7,build TEST_ALL_TARGET=adb_test +post-patch: slave-post-patch +slave-post-patch: +# XXX C++ exception with description "regex_error" thrown in the test body. + @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ + ${REINPLACE_CMD} -Ee '/^TEST/\ + s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ + ${WRKSRC}/base/logging_test.cpp; \ + fi +.if defined(PACKAGE_BUILDING) +# XXX /dev/full isn't mounted by poudriere/tinderbox + @${REINPLACE_CMD} -e '/^TEST/s/[^ ]*ENOSPC/DISABLED_&/' \ + ${WRKSRC}/adb/adb_io_test.cpp +.endif + pre-install-TEST-on: ${BUILD_WRKSRC}/adb_test +# XXX python tests may leave behind running adb server PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \ ${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \ Added: head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-adb-devel/files/patch-adb_socket__test.cpp Tue Sep 29 22:49:02 2015 (r398189) @@ -0,0 +1,20 @@ +Likely fails for the same reason as on OS X. + + [ RUN ] LocalSocketTest.close_with_no_events_installed + socket_test.cpp:36: Failure + Value of: fdevent_installed_count() + Actual: 2 + Expected: 1u + Which is: 1 + +--- adb/socket_test.cpp.orig 2015-09-17 22:58:36 UTC ++++ adb/socket_test.cpp +@@ -277,7 +277,7 @@ static void CloseNoEventsThreadFunc(Clos + // This test successes on linux but fails on mac because of different implementation of + // poll(). I think the function tested here is useful to make adb server more stable on + // linux. +-TEST_F(LocalSocketTest, close_with_no_events_installed) { ++TEST_F(LocalSocketTest, DISABLED_close_with_no_events_installed) { + int socket_fd[2]; + ASSERT_EQ(0, adb_socketpair(socket_fd)); + Modified: head/devel/android-tools-simpleperf/Makefile ============================================================================== --- head/devel/android-tools-simpleperf/Makefile Tue Sep 29 21:56:28 2015 (r398188) +++ head/devel/android-tools-simpleperf/Makefile Tue Sep 29 22:49:02 2015 (r398189) @@ -41,6 +41,14 @@ post-extract: @(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC}) @${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic +post-patch: +# XXX C++ exception with description "regex_error" thrown in the test body. + @if [ ${OPSYS} = FreeBSD -a ${OSREL:R} -lt 10 ]; then \ + ${REINPLACE_CMD} -Ee '/^TEST/\ + s/ (LOG|PLOG|UNIMPLEMENTED)/ DISABLED_\1/' \ + ${WRKSRC}/base/logging_test.cpp; \ + fi + pre-install-TEST-on: ${BUILD_WRKSRC}/simpleperf_unit_test