svn commit: r444903 - in branches/2017Q3/devel/android-tools-adb-devel: . files

[Jan Beich]

Author: jbeich
Date: Sun Jul  2 22:32:09 2017
New Revision: 444903
URL: https://svnweb.freebsd.org/changeset/ports/444903

Log:
  MFH: r444902
  
  devel/android-tools-adb-devel: unbreak TEST=on
  
  [ RUN      ] logging.DCHECK
  adb/../base/logging_test.cpp:89: Failure
  Death test: {SuppressAbortUI(); if (::android::base::kEnableDChecks) (__builtin_expect( ((false)) != 0, true )) || (false) || ::android::base::LogMessage( "adb/../base/logging_test.cpp", 89, ::android::base::DEFAULT, ::android::base::FATAL, -1).stream() << "Check failed: " "false" << " ";}
      Result: died but not with expected error.
    Expected: DCheck failed: false
  Actual msg:
  [  DEATH   ] adb_test F 07-02 17:11:02 69537 100707 logging_test.cpp:89] Check failed: false
  [  DEATH   ]
  [  FAILED  ] logging.DCHECK (1 ms)
  
  [ RUN      ] file.ReadFileToString_WriteStringToFile_symlink
  adb/../base/file_test.cpp:55: Failure
        Expected: 62
  To be equal to: (* __error())
        Which is: 31
  [  FAILED  ] file.ReadFileToString_WriteStringToFile_symlink (0 ms)
  
  [ RUN      ] file.Readlink
  adb/../base/file_test.cpp:148: Failure
        Expected: 0
  To be equal to: symlink(max.c_str(), max_path.c_str())
        Which is: -1
  [  FAILED  ] file.Readlink (0 ms)
  
  Approved by:	ports-secteam blanket

Added:
  branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_file__test.cpp
     - copied unchanged from r444902, head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp
Modified:
  branches/2017Q3/devel/android-tools-adb-devel/Makefile
  branches/2017Q3/devel/android-tools-adb-devel/files/Makefile
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/devel/android-tools-adb-devel/Makefile
==============================================================================
--- branches/2017Q3/devel/android-tools-adb-devel/Makefile	Sun Jul  2 22:29:33 2017	(r444902)
+++ branches/2017Q3/devel/android-tools-adb-devel/Makefile	Sun Jul  2 22:32:09 2017	(r444903)
@@ -17,15 +17,13 @@ GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$
 
 USES=		compiler:c++14-lang
 
-OPTIONS_DEFAULT=MDNSRESPONDER
 OPTIONS_DEFINE=	MDNSRESPONDER TEST_PYTHON
+OPTIONS_DEFAULT=MDNSRESPONDER
 
 MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
 MDNSRESPONDER_USES=		localbase:ldflags
 MDNSRESPONDER_LDFLAGS=		-ldns_sd
 MDNSRESPONDER_MAKE_ENV_OFF=	MDNSEXT=_unsupported
-
-TEST_BROKEN=	logging.* tests always fail after 4e5fd111d84d
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development

Modified: branches/2017Q3/devel/android-tools-adb-devel/files/Makefile
==============================================================================
--- branches/2017Q3/devel/android-tools-adb-devel/files/Makefile	Sun Jul  2 22:29:33 2017	(r444902)
+++ branches/2017Q3/devel/android-tools-adb-devel/files/Makefile	Sun Jul  2 22:32:09 2017	(r444903)
@@ -68,6 +68,7 @@ TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
+CPPFLAGS.logging_test.cpp+= -DNDEBUG # XXX DCHECK vs. timestamps
 
 .PATH: ${.CURDIR}/../libcrypto_utils
 SRCS+= android_pubkey.c

Copied: branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_file__test.cpp (from r444902, head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q3/devel/android-tools-adb-devel/files/patch-base_file__test.cpp	Sun Jul  2 22:32:09 2017	(r444903, copy of r444902, head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp)
@@ -0,0 +1,42 @@
+--- base/file_test.cpp.orig	2017-06-20 10:50:27 UTC
++++ base/file_test.cpp
+@@ -52,12 +52,20 @@ TEST(file, ReadFileToString_WriteStringToFile_symlink)
+   ASSERT_EQ(0, unlink(link.path));
+   ASSERT_EQ(0, symlink(target.path, link.path));
+   ASSERT_FALSE(android::base::WriteStringToFile("foo", link.path, false));
++#ifdef __linux__
+   ASSERT_EQ(ELOOP, errno);
++#else
++  ASSERT_EQ(EMLINK, errno);
++#endif
+   ASSERT_TRUE(android::base::WriteStringToFile("foo", link.path, true));
+ 
+   std::string s;
+   ASSERT_FALSE(android::base::ReadFileToString(link.path, &s));
++#ifdef __linux__
+   ASSERT_EQ(ELOOP, errno);
++#else
++  ASSERT_EQ(EMLINK, errno);
++#endif
+   ASSERT_TRUE(android::base::ReadFileToString(link.path, &s, true));
+   ASSERT_EQ("foo", s);
+ }
+@@ -131,6 +139,7 @@ TEST(file, RemoveFileIfExist) {
+ 
+ TEST(file, Readlink) {
+ #if !defined(_WIN32)
++#ifdef __linux__
+   // Linux doesn't allow empty symbolic links.
+   std::string min("x");
+   // ext2 and ext4 both have PAGE_SIZE limits.
+@@ -139,6 +148,10 @@ TEST(file, Readlink) {
+   // in current kernels (and marlin/sailfish where we're seeing this
+   // failure are still on 3.18, far from current). http://b/33306057.
+   std::string max(static_cast<size_t>(4096 - 2 - 1 - 1), 'x');
++#else
++  std::string min("");
++  std::string max(static_cast<size_t>(1024 - 1), 'x');
++#endif
+ 
+   TemporaryDir td;
+   std::string min_path{std::string(td.path) + "/" + "min"};