From 62fa39841ef0cfa8d9445079d7970a2e42484c81 Mon Sep 17 00:00:00 2001
From: Max Desiatov <max@desiatov.com>
Date: Sat, 6 Jun 2020 21:31:47 +0100
Subject: [PATCH 1/2] Build XCTest for WASI

---
 utils/webassembly/build-toolchain.sh |  1 +
 utils/webassembly/build-xctest.sh    | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100755 utils/webassembly/build-xctest.sh

diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh
index 38029ec10bf60..e006b78a7c564 100755
--- a/utils/webassembly/build-toolchain.sh
+++ b/utils/webassembly/build-toolchain.sh
@@ -81,6 +81,7 @@ else
 fi
 
 $UTILS_PATH/build-foundation.sh $TMP_DIR/$TOOLCHAIN_NAME
+$UTILS_PATH/build-xctest.sh $TMP_DIR/$TOOLCHAIN_NAME
 
 cd $TMP_DIR
 tar cfz $PACKAGE_ARTIFACT $TOOLCHAIN_NAME
diff --git a/utils/webassembly/build-xctest.sh b/utils/webassembly/build-xctest.sh
new file mode 100755
index 0000000000000..876a62422421c
--- /dev/null
+++ b/utils/webassembly/build-xctest.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -ex
+DESTINATION_TOOLCHAIN=$1
+SOURCE_PATH="$(cd "$(dirname $0)/../../.." && pwd)"
+
+BUILD_DIR="$SOURCE_PATH/build/Ninja-ReleaseAssert/xctest-wasi-wasm32"
+
+mkdir -p $BUILD_DIR
+cd $BUILD_DIR
+
+cmake -G Ninja \
+  -DCMAKE_Swift_COMPILER="$DESTINATION_TOOLCHAIN/usr/bin/swiftc" \
+  -DCMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
+  -DCMAKE_TOOLCHAIN_FILE="$SOURCE_PATH/swift/utils/webassembly/toolchain-wasi.cmake" \
+  -DWASI_SDK_PATH="$SOURCE_PATH/wasi-sdk" \
+  -DICU_ROOT="$SOURCE_PATH/icu_out" \
+  -DBUILD_SHARED_LIBS=OFF \
+  -DSWIFT_FOUNDATION_PATH=$DESTINATION_TOOLCHAIN/usr/lib/swift/wasi/wasm32 \
+  "${SOURCE_PATH}/swift-corelibs-xctest"
+  
+ninja -v
+ninja -v install

From d1dee3d359e643d0923394bece8e84375a812424 Mon Sep 17 00:00:00 2001
From: Max Desiatov <max@desiatov.com>
Date: Sat, 6 Jun 2020 21:34:24 +0100
Subject: [PATCH 2/2] Avoid passing unused ICU_ROOT variable

---
 utils/webassembly/build-xctest.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/webassembly/build-xctest.sh b/utils/webassembly/build-xctest.sh
index 876a62422421c..e08e0cef33db1 100755
--- a/utils/webassembly/build-xctest.sh
+++ b/utils/webassembly/build-xctest.sh
@@ -13,7 +13,6 @@ cmake -G Ninja \
   -DCMAKE_STAGING_PREFIX="$DESTINATION_TOOLCHAIN/usr" \
   -DCMAKE_TOOLCHAIN_FILE="$SOURCE_PATH/swift/utils/webassembly/toolchain-wasi.cmake" \
   -DWASI_SDK_PATH="$SOURCE_PATH/wasi-sdk" \
-  -DICU_ROOT="$SOURCE_PATH/icu_out" \
   -DBUILD_SHARED_LIBS=OFF \
   -DSWIFT_FOUNDATION_PATH=$DESTINATION_TOOLCHAIN/usr/lib/swift/wasi/wasm32 \
   "${SOURCE_PATH}/swift-corelibs-xctest"