svn commit: r398189 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-simpleperf

[Jan Beich]

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