From 2925a537840b9d166b437d4a7ef46b2ea364ffe2 Mon Sep 17 00:00:00 2001
From: Alsey Coleman Miller <alseycmiller@gmail.com>
Date: Fri, 27 Dec 2024 08:55:04 +0000
Subject: [PATCH] Update test script

---
 .../build-scripts/{test-swift.sh => build-test.sh}  |  2 +-
 .devcontainer/build-scripts/run-test.sh             | 13 +++++++++++++
 .github/workflows/buildroot.yml                     |  4 ++--
 3 files changed, 16 insertions(+), 3 deletions(-)
 rename .devcontainer/build-scripts/{test-swift.sh => build-test.sh} (73%)
 create mode 100755 .devcontainer/build-scripts/run-test.sh

diff --git a/.devcontainer/build-scripts/test-swift.sh b/.devcontainer/build-scripts/build-test.sh
similarity index 73%
rename from .devcontainer/build-scripts/test-swift.sh
rename to .devcontainer/build-scripts/build-test.sh
index 5bf139a..8e7a882 100755
--- a/.devcontainer/build-scripts/test-swift.sh
+++ b/.devcontainer/build-scripts/build-test.sh
@@ -8,4 +8,4 @@ source $SWIFT_BUILDROOT/.devcontainer/build-scripts/swift-define
 # Build
 cd $WORKING_DIR
 make $BUILDROOT_OPTIONS swift-hello-build
-/usr/bin/$QEMU_BIN -L $BUILDROOT_TARGET $BUILDROOT_TARGET/usr/bin/swift-hello
\ No newline at end of file
+file $BUILDROOT_TARGET/usr/bin/swift-hello
\ No newline at end of file
diff --git a/.devcontainer/build-scripts/run-test.sh b/.devcontainer/build-scripts/run-test.sh
new file mode 100755
index 0000000..cf3220f
--- /dev/null
+++ b/.devcontainer/build-scripts/run-test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+# Configurable
+SWIFT_BUILDROOT="${SWIFT_BUILDROOT:=$(pwd)}"
+source $SWIFT_BUILDROOT/.devcontainer/build-scripts/swift-define
+
+# Build
+cd $WORKING_DIR
+make $BUILDROOT_OPTIONS swift-hello-build
+QEMU_TEST="/usr/bin/$QEMU_BIN -L $BUILDROOT_TARGET $BUILDROOT_TARGET/usr/bin/swift-hello"
+echo "$QEMU_TEST"
+$QEMU_TEST
\ No newline at end of file
diff --git a/.github/workflows/buildroot.yml b/.github/workflows/buildroot.yml
index 236f8c0..8c97c4d 100644
--- a/.github/workflows/buildroot.yml
+++ b/.github/workflows/buildroot.yml
@@ -22,11 +22,11 @@ jobs:
           with:
             name: build-${{ matrix.arch }}
             path: ${{ github.workspace }}/output/${{ matrix.arch }}/images/rootfs.tar
-        - name: Test
+        - name: Build Test
           run: |
               export SWIFT_BUILDROOT=$GITHUB_WORKSPACE
               export SWIFT_TARGET_ARCH=${{ matrix.arch }}
-              $SWIFT_BUILDROOT/.devcontainer/build-scripts/test-swift.sh
+              $SWIFT_BUILDROOT/.devcontainer/build-scripts/build-test.sh
         - name: Upload test binary
           uses: actions/upload-artifact@v4.5.0
           with: