Skip to content

[Android] Enable more code and tests #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 17, 2024
Merged

[Android] Enable more code and tests #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f857783
[Android] Enable more code and tests
finagolfin Aug 17, 2024
0442db2
Remove incorrect WASI check
finagolfin Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/FoundationEssentials/Data/Data+Reading.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import WASILibc
func _fgetxattr(_ fd: Int32, _ name: UnsafePointer<CChar>!, _ value: UnsafeMutableRawPointer!, _ size: Int, _ position: UInt32, _ options: Int32) -> Int {
#if canImport(Darwin)
return fgetxattr(fd, name, value, size, position, options)
#elseif canImport(Glibc) || canImport(Musl)
#elseif canImport(Glibc) || canImport(Musl) || canImport(Android)
return fgetxattr(fd, name, value, size)
#else
return -1
Expand Down Expand Up @@ -355,7 +355,7 @@ internal func readBytesFromFile(path inPath: PathOrURL, reportProgress: Bool, ma
let localProgress = (reportProgress && Progress.current() != nil) ? Progress(totalUnitCount: Int64(fileSize)) : nil

if fileSize == 0 {
#if os(Linux)
#if os(Linux) || os(Android)
// Linux has some files that may report a size of 0 but actually have contents
let chunkSize = 1024 * 4
var buffer = malloc(chunkSize)!
Expand Down
2 changes: 2 additions & 0 deletions Sources/FoundationEssentials/FileManager/FileManager+Files.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,8 @@ extension _FileManagerImpl {
#if os(WASI)
// WASI does not support extended attributes
throw CocoaError.errorWithFilePath(.featureUnsupported, path)
#elseif canImport(Android)
// Android doesn't allow setting this for normal apps, so just skip it.
#else
try Self._setAttributes(extendedAttrs, at: fileSystemRepresentation, followSymLinks: false)
#endif
Expand Down
4 changes: 2 additions & 2 deletions Sources/FoundationEssentials/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ extension Platform {
extension Platform {
@discardableResult
package static func copyCString(dst: UnsafeMutablePointer<CChar>, src: UnsafePointer<CChar>, size: Int) -> Int {
#if canImport(Darwin)
#if canImport(Darwin) || canImport(Android)
return strlcpy(dst, src, size)
#else
// Glibc doesn't support strlcpy
Expand Down Expand Up @@ -267,7 +267,7 @@ extension Platform {
return String(cString: buffer.baseAddress!).standardizingPath
#endif
}
#elseif os(Linux)
#elseif os(Linux) || os(Android)
// For Linux, read /proc/self/exe
return try? FileManager.default.destinationOfSymbolicLink(
atPath: "/proc/self/exe").standardizingPath
Expand Down
6 changes: 3 additions & 3 deletions Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ extension _ProcessInfo {
var siInfo = SYSTEM_INFO()
GetSystemInfo(&siInfo)
return Int(siInfo.dwNumberOfProcessors)
#elseif os(Linux) || os(FreeBSD)
#elseif os(Linux) || os(FreeBSD) || canImport(Android)
return Int(sysconf(Int32(_SC_NPROCESSORS_CONF)))
#else
return 1
Expand All @@ -467,7 +467,7 @@ extension _ProcessInfo {
return 0
}
return Int(count)
#elseif os(Linux) || os(FreeBSD)
#elseif os(Linux) || os(FreeBSD) || canImport(Android)
#if os(Linux)
if let fsCount = Self.fsCoreCount() {
return fsCount
Expand Down Expand Up @@ -561,7 +561,7 @@ extension _ProcessInfo {
return 0
}
return totalMemoryKB * 1024
#elseif os(Linux) || os(FreeBSD)
#elseif os(Linux) || os(FreeBSD) || canImport(Android)
var memory = sysconf(Int32(_SC_PHYS_PAGES))
memory *= sysconf(Int32(_SC_PAGESIZE))
return UInt64(memory)
Expand Down
2 changes: 1 addition & 1 deletion Sources/FoundationEssentials/TimeZone/TimeZone_Cache.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ struct TimeZoneCache : Sendable, ~Copyable {
}
}

#if os(Linux) && !os(WASI)
#if os(Linux)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kateinoigakukun, I assume the os can't be both Linux and WASI?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, just a os(Linux) should be enough.

// Try localtime
tzset()
var t = time(nil)
Expand Down
2 changes: 1 addition & 1 deletion Tests/FoundationEssentialsTests/DataIOTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ class DataIOTests : XCTestCase {
}

func test_zeroSizeFile() throws {
#if !os(Linux)
#if !os(Linux) && !os(Android)
throw XCTSkip("This test is only applicable on Linux")
#else
// Some files in /proc report a file size of 0 bytes via a stat call
Expand Down
2 changes: 1 addition & 1 deletion Tests/FoundationEssentialsTests/DataTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,7 @@ extension DataTests {
}

func testEOPNOTSUPP() throws {
#if !canImport(Darwin) && !os(Linux)
#if !canImport(Darwin) && !os(Linux) && !os(Android)
throw XCTSkip("POSIXError.Code is not supported on this platform")
#else
// Opening a socket via open(2) on Darwin can result in the EOPNOTSUPP error code
Expand Down
9 changes: 9 additions & 0 deletions Tests/FoundationEssentialsTests/FileManager/FileManagerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ import TestSupport
@testable import Foundation
#endif

#if canImport(Android)
import Android
#endif
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious why we need this import here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the compilation error I get without it:

Tests/FoundationEssentialsTests/FileManager/FileManagerTests.swift:622:15: error: cannot find 'getuid' in scope
620 |     func testFileAccessAtPath() throws {
621 |         #if !os(Windows)
622 |         guard getuid() != 0 else {
    |               `- error: cannot find 'getuid' in scope

There are some strange issues with these platform overlays, which I investigated a bit last month. Since nobody I asked seems to have a good idea of what's going on, I chalked it up to some Swift module leak that can be fixed later and am just adding these imports now to shut the compiler up.


extension FileManager {
fileprivate var delegateCaptures: DelegateCaptures {
(self.delegate as! CapturingFileManagerDelegate).captures
Expand Down Expand Up @@ -337,8 +341,13 @@ final class FileManagerTests : XCTestCase {
XCTAssertTrue($0.delegateCaptures.isEmpty)
try $0.linkItem(atPath: "foo", toPath: "bar")
XCTAssertEqual($0.delegateCaptures.shouldLink, [.init("foo", "bar")])
#if os(Android) // Hard links are not normally allowed on Android.
XCTAssertEqual($0.delegateCaptures.shouldProceedAfterLinkError, [.init("foo", "bar", code: .fileWriteNoPermission)])
XCTAssertFalse($0.fileExists(atPath: "bar"))
#else
XCTAssertEqual($0.delegateCaptures.shouldProceedAfterLinkError, [])
XCTAssertTrue($0.fileExists(atPath: "bar"))
#endif
}

try FileManagerPlayground {
Expand Down
2 changes: 1 addition & 1 deletion Tests/FoundationEssentialsTests/PredicateTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ final class PredicateTests: XCTestCase {
func testRegex_RegexBuilder() throws {
#if !canImport(RegexBuilder)
throw XCTSkip("RegexBuilder is unavavailable on this platform")
#elseif !os(Linux) && !FOUNDATION_FRAMEWORK
#elseif !os(Linux) && !os(Android) && !FOUNDATION_FRAMEWORK
// Disable this test in swift-foundation macOS CI because of incorrect availability annotations in the StringProcessing module
throw XCTSkip("This test is currently disabled on this platform")
#else
Expand Down
4 changes: 2 additions & 2 deletions Tests/FoundationEssentialsTests/ProcessInfoTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ final class ProcessInfoTests : XCTestCase {
let expectedMinMajorVersion = 2
#endif
XCTAssertGreaterThanOrEqual(version.majorVersion, expectedMinMajorVersion, "Unrealistic major system version")
#elseif os(Windows) || os(Linux)
#elseif os(Windows) || os(Linux) || os(Android)
let minVersion = OperatingSystemVersion(majorVersion: 1, minorVersion: 0, patchVersion: 0)
XCTAssertTrue(ProcessInfo.processInfo.isOperatingSystemAtLeast(minVersion))
#else
Expand Down Expand Up @@ -171,7 +171,7 @@ final class ProcessInfoTests : XCTestCase {
func testProcessName() {
#if FOUNDATION_FRAMEWORK
let targetName = "TestHost"
#elseif os(Linux) || os(Windows)
#elseif os(Linux) || os(Windows) || os(Android)
let targetName = "swift-foundationPackageTests.xctest"
#else
let targetName = "xctest"
Expand Down