Update swift test to work in windows image

update swift windows commit: swiftlang/swift-docker@3fc6093
vakarisbk · Nov 9, 2023 · 83d6a98 · 83d6a98
1 parent e18ceef
commit 83d6a98
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/library/swift b/library/swift
@@ -56,7 +56,7 @@ Directory: 5.9/rhel-ubi/9/slim
 
 Tags: 5.9.1-windowsservercore-ltsc2022, 5.9-windowsservercore-ltsc2022, windowsservercore-ltsc2022
 Architectures: windows-amd64
-GitCommit: c8e240c7d638c1fbc037aaa15961e1e1f0d93e97
+GitCommit: 3fc609343f771e31c17140ed90d6cb2023e6e701
 Directory: 5.9/windows/LTSC2022
 Constraints: windowsservercore-ltsc2022
 

diff --git a/test/tests/run-swift-in-container.sh b/test/tests/run-swift-in-container.sh
@@ -4,4 +4,15 @@ set -e
 testDir="$(readlink -f "$(dirname "$BASH_SOURCE")")"
 runDir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-source "$runDir/run-in-container.sh" "$testDir" "$1" swift ./container.swift
+image="$1"
+
+testName="$(basename "$testDir")"
+newImage="$("$runDir/image-name.sh" "librarytest/$testName" "$image")"
+"$runDir/docker-build.sh" "$testDir" "$newImage" <<EOD
+FROM $image
+COPY dir/container.swift /
+RUN swiftc /container.swift -o container
+CMD [ "/container" ]
+EOD
+
+docker run --rm "$newImage"