[android] Enable Thread tests were possible.

Enable most of the Thread test for Android. The only tests that cannot
pass right now are the ones related to backtraces, which do not use the
Linux API backtrace and would need an specific implementation.

And while Android did not get pthread_getname_np until API 26, the low
level prctl(PR_GET_NAME) works with the same restriction as in Linux
(only 15 characters). With that change, the test about thread names also
passes in Android.

Author: drodriguez

CoreFoundation/Base.subproj/CFPlatform.c

@@ -35,6 +35,10 @@
 
 #endif
 
+#if TARGET_OS_ANDROID
+#include <sys/prctl.h>
+#endif
+
 #if TARGET_OS_MAC || TARGET_OS_WIN32
 #define kCFPlatformInterfaceStringEncoding	kCFStringEncodingUTF8
 #else
@@ -1491,6 +1495,15 @@ CF_CROSS_PLATFORM_EXPORT int _CFThreadSetName(_CFThreadRef thread, const char *_
 CF_CROSS_PLATFORM_EXPORT int _CFThreadGetName(char *buf, int length) {
 #if TARGET_OS_MAC
     return pthread_getname_np(pthread_self(), buf, length);
+#elif TARGET_OS_ANDROID
+    // Android did not get pthread_getname_np until API 26, but prctl seems to
+    // return at least 15 chars of the name.
+    char *buffer[16] = {0};
+    if (prctl(PR_GET_NAME, buffer, 0, 0, 0) != 0) {
+        return -1;
+    }
+    memcpy(buf, buffer, MIN(strnlen(buffer, 16), length));
+    return 0;
 #elif TARGET_OS_LINUX
     return pthread_getname_np(pthread_self(), buf, length);
 #endif
@@ -1528,4 +1541,3 @@ CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
 }
 
 #endif
-

TestFoundation/TestThread.swift

@@ -21,18 +21,20 @@
 
 class TestThread : XCTestCase {
     static var allTests: [(String, (TestThread) -> () throws -> Void)] {
-#if os(Android)
-        return []
-#endif
-
         var tests: [(String, (TestThread) -> () throws -> Void)] = [
-            ("test_currentThread", test_currentThread ),
+            ("test_currentThread", test_currentThread),
             ("test_threadStart", test_threadStart),
             ("test_mainThread", test_mainThread),
-            ("test_callStackSymbols", test_callStackSymbols),
-            ("test_callStackReurnAddresses", test_callStackReturnAddresses),
         ]
 
+#if !os(Android)
+        // Android doesn't support backtraces at the moment.
+        tests.append(contentsOf: [
+            ("test_callStackSymbols", test_callStackSymbols),
+            ("test_callStackReturnAddresses", test_callStackReturnAddresses),
+        ])
+#endif
+
 #if NS_FOUNDATION_ALLOWS_TESTABLE_IMPORT
         tests.append(contentsOf: [
             ("test_threadName", test_threadName),
@@ -71,7 +73,7 @@ class TestThread : XCTestCase {
         // No name is set initially
         XCTAssertNil(Thread.current.name)
 
-#if os(Linux) // Linux sets the initial thread name to the process name.
+#if os(Linux) || os(Android) // Linux sets the initial thread name to the process name.
         XCTAssertEqual(Thread.current._name, "TestFoundation")
 #else
         XCTAssertEqual(Thread.current._name, "")
@@ -93,7 +95,7 @@ class TestThread : XCTestCase {
             XCTAssertEqual(Thread.current.name, "12345678901234567890")
 #if os(macOS) || os(iOS)
             XCTAssertEqual(Thread.current._name, Thread.current.name)
-#elseif os(Linux)
+#elseif os(Linux) || os(Android)
             // pthread_setname_np() only allows 15 characters on Linux, so setting it fails
             // and the previous name will still be there.
             XCTAssertEqual(Thread.current._name, "Thread2-2")