Switch from WASI_LIBC_VERSION to WASI_SDK_VERSION while I'm in here

Author: grynspan

Sources/Testing/Support/Versions.swift

@@ -88,8 +88,8 @@ let operatingSystemVersion: String = {
     }
   }
 #elseif os(WASI)
-  if let libcVersion = swt_getWASIVersion().flatMap(String.init(validatingCString:)), !libcVersion.isEmpty {
-    return "WASI with libc \(libcVersion)"
+  if let version = swt_getWASIVersion().flatMap(String.init(validatingCString:)) {
+    return version
   }
 #else
 #warning("Platform-specific implementation missing: OS version unavailable")

Sources/_TestingInternals/Versions.cpp

@@ -10,9 +10,14 @@
 
 #include "Versions.h"
 
-#if defined(_SWT_TESTING_LIBRARY_VERSION)
+#if defined(__wasi__) && __has_include(<wasi/version.h>)
+#include <wasi/version.h>
+#endif
+
+#if defined(_SWT_TESTING_LIBRARY_VERSION) && !defined(SWT_TESTING_LIBRARY_VERSION)
 #warning _SWT_TESTING_LIBRARY_VERSION is deprecated
 #warning Define SWT_TESTING_LIBRARY_VERSION and optionally SWT_TARGET_TRIPLE instead
+#define SWT_TESTING_LIBRARY_VERSION _SWT_TESTING_LIBRARY_VERSION
 #endif
 
 const char *swt_getTestingLibraryVersion(void) {
@@ -41,8 +46,8 @@ const char *swt_getTargetTriple(void) {
 
 #if defined(__wasi__)
 const char *swt_getWASIVersion(void) {
-#if defined(WASI_LIBC_VERSION)
-  return WASI_LIBC_VERSION;
+#if defined(WASI_SDK_VERSION)
+  return WASI_SDK_VERSION;
 #else
   return nullptr;
 #endif

Sources/_TestingInternals/include/Versions.h

@@ -32,10 +32,10 @@ SWT_EXTERN const char *_Nullable swt_getTargetTriple(void);
 /// Get the version of the C standard library and runtime used by WASI, if
 /// available.
 ///
-/// This function is provided because `WASI_LIBC_VERSION` may or may not be
+/// This function is provided because `WASI_SDK_VERSION` may or may not be
 /// defined and may or may not be a complex macro.
 ///
-/// For more information about the `WASI_LIBC_VERSION` macro, see
+/// For more information about the `WASI_SDK_VERSION` macro, see
 /// [wasi-libc-#490](https://github.com/WebAssembly/wasi-libc/issues/490).
 SWT_EXTERN const char *_Nullable swt_getWASIVersion(void);