svn commit: r398993 - head/devel/android-tools-adb
Jan Beich
jbeich at FreeBSD.org
Sat Oct 10 13:16:59 UTC 2015
Author: jbeich
Date: Sat Oct 10 13:16:57 2015
New Revision: 398993
URL: https://svnweb.freebsd.org/changeset/ports/398993
Log:
devel/android-tools-adb: unbreak TEST=on more reliably
/dev/full is only provided by default on 11.0, earlier releases have it
in lindev(4). This leads to the same error as with automation. Other BSDs
including DragonFly don't provide /dev/full at all.
[ RUN ] io.WriteFdExactly_ENOSPC
adb_io_test.cpp:136: Failure
Expected: (-1) != (fd), actual: -1 vs -1
[ FAILED ] io.WriteFdExactly_ENOSPC (1 ms)
Reported by: Barbara <barbara.freebsd at gmail.com>
Modified:
head/devel/android-tools-adb/Makefile (contents, props changed)
Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile Sat Oct 10 12:55:33 2015 (r398992)
+++ head/devel/android-tools-adb/Makefile Sat Oct 10 13:16:57 2015 (r398993)
@@ -63,11 +63,11 @@ post-patch:
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
+# XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0
+ @if [ ! -e /dev/full ]; then \
+ ${REINPLACE_CMD} -e '/^TEST/s/[^ ]*ENOSPC/DISABLED_&/' \
+ ${WRKSRC}/adb/adb_io_test.cpp; \
+ fi
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H}
More information about the svn-ports-head
mailing list