Improve test run exit system

Gaming32 · May 15, 2024 · ad882a0 · ad882a0
1 parent 10860c2
commit ad882a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,5 +43,4 @@ jobs:
       - name: Compile World Host
         run: ./gradlew :${{ matrix.subproject }}:classes
       - name: Run tests
-        run: |
-          xvfb-run -a -s "-screen 0 1920x1080x24" bash -c './gradlew :${{ matrix.subproject }}:runTestHost --stacktrace & ./gradlew :${{ matrix.subproject }}:runTestJoiner --stacktrace && fg'
+        run: xvfb-run -a -s "-screen 0 1920x1080x24" ./runTests.sh
diff --git a/runTests.sh b/runTests.sh
@@ -0,0 +1,10 @@
+./gradlew :$1:runTestHost --stacktrace &
+$host_pid = $!
+./gradlew :$1:runTestJoiner --stacktrace &
+$joiner_pid = $!
+wait $host_pid
+$code = $?
+if [ $host_pid -ne 0 ]; then
+  exit $code
+fi
+exit $(wait $joiner_pid)