Merge branch 'fix/frizlab/wasi_and_android' into develop

Author: Frizlab

Sources/CLTLogger.swift

@@ -1,3 +1,6 @@
+#if canImport(Android)
+import Android
+#endif
 import Foundation
 #if canImport(WinSDK)
 import WinSDK
@@ -217,11 +220,13 @@ public struct CLTLogger : LogHandler {
 			 * (When Package.swift is built we can check if the value of the __CFBundleIdentifier env var is "com.apple.dt.Xcode".)
 			 * The solution we’re currently using is to check whether the fd on which we write has a foreground process group as Xcode does not set one. 
 			 * Note: If Xcode detection is changed here, it should also be changed in defaultConstantsByLogLevelForEmoji. */
+ #if canImport(Darwin)
 			if tcgetpgrp(fh.fileDescriptor) == -1 && errno == ENOTTY {
 				/* We log using emojis in Xcode. */
 				return .emoji
 			}
-			/* If the TERM env var is not set we assume colors are not supported and return the text logging style. 
+ #endif
+			/* If the TERM env var is not set we assume colors are not supported and return the text logging style.
 			 * In theory we should use the curses database to check for colors (ncurses has the `has_colors` function for this). */
 			return (ProcessInfo.processInfo.environment["TERM"] == nil ? .text : .color)
 		}

Sources/OutputEnvironment.swift

@@ -42,7 +42,7 @@ internal enum OutputEnvironment : String, CaseIterable {
 			return OutputEnvironment(rawValue: envStr) ?? .unknown
 		}
 
-#if !os(Windows)
+#if canImport(Darwin)
 		/* Let’s detect Xcode. */
 		if isatty(fh.fileDescriptor) != 0 && tcgetpgrp(fh.fileDescriptor) == -1 && errno == ENOTTY {
 			return .xcode

Tests/LinuxMain.swift

@@ -1,7 +1,10 @@
+import Foundation
 import XCTest
 
 @testable import CLTLoggerTests
 
+
+
 var tests: [XCTestCaseEntry] = [
 	testCase([
 		("testFromDoc", CLTLoggerTests.testFromDoc),
@@ -34,4 +37,25 @@ var tests: [XCTestCaseEntry] = [
 		("testBackslashEscape", StringEscapingTests.testBackslashEscape),
 	]),
 ]
+#if !os(WASI)
 XCTMain(tests)
+
+#else
+/* Compilation fails for Swift <5.5… */
+//await XCTMain(tests)
+
+/* Let’s print a message to inform the tests on WASI are disabled. */
+import struct CLTLogger.SGR
+try FileHandle.standardError.write(contentsOf: Data("""
+\(SGR(.fgColorTo4BitBrightRed, .bold).rawValue)Tests are disabled on WASI\(SGR.reset.rawValue):
+\(SGR(.fgColorTo256PaletteValue(245)).rawValue)CLTLogger is compatible with Swift <5.4, so we have to add a LinuxMain file in which we call XCTMain.
+On WASI the XCTMain function is async, so we have to #if the XCTMain call, one with the await keyword, the other without.
+However, on Swift <5.5 the LinuxMain setup like this does not compile because the old compiler does not know the await keyword
+ (even though the whole code is ignored because we do not compile for WASI whe compiling with an old compiler).
+I also tried doing a #if swift(>=5.5) check, but that do not work either.\(SGR.reset.rawValue)
+
+\(SGR(.fgColorTo4BitMagenta, .bold).rawValue)To temporarily enable the tests for WASI, uncomment the `await XCTMain(tests)` line in LinuxMain.swift.\(SGR.reset.rawValue)
+
+""".utf8))
+
+#endif