Update test script

MillerTechnologyPeru · Dec 27, 2024 · 2925a53 · 2925a53
1 parent c0fca55
commit 2925a53
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/.devcontainer/build-scripts/test-swift.sh → .devcontainer/build-scripts/build-test.sh b/.devcontainer/build-scripts/test-swift.sh → .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
+file $BUILDROOT_TARGET/usr/bin/swift-hello
diff --git a/.devcontainer/build-scripts/run-test.sh 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
diff --git 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/[email protected]
           with: