diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/test_manual.yml | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/.github/workflows/test_manual.yml b/.github/workflows/test_manual.yml index 095828656..c2ec33499 100644 --- a/.github/workflows/test_manual.yml +++ b/.github/workflows/test_manual.yml @@ -91,16 +91,19 @@ jobs: - name: Build & Test shell: bash run: | - EXTRA_ARGS="" - MALLOC_ARG="" + set -x + ARGS=(test -v -y --run=${{ inputs.test_suite }} --junit) + PASSTHROUGH=() if [ "${{ inputs.malloc }}" != "default" ]; then - MALLOC_ARG="--malloc=${{ inputs.malloc }}" + PASSTHROUGH+=(--malloc=${{ inputs.malloc }}) fi - USER_ARGS="${{ inputs.extra_args }}" - if [ -n "$MALLOC_ARG" ] || [ -n "$USER_ARGS" ]; then - EXTRA_ARGS="-- $MALLOC_ARG $USER_ARGS" + if [ -n "${{ inputs.extra_args }}" ]; then + PASSTHROUGH+=(${{ inputs.extra_args }}) fi - xmake test -v -y --run=${{ inputs.test_suite }} --junit $EXTRA_ARGS + if [ ${#PASSTHROUGH[@]} -gt 0 ]; then + ARGS+=(-- "${PASSTHROUGH[@]}") + fi + xmake "${ARGS[@]}" - name: Kill test processes if: always() @@ -177,16 +180,19 @@ jobs: - name: Build & Test run: | - EXTRA_ARGS="" - MALLOC_ARG="" + set -x + ARGS=(test -v -y --run=${{ inputs.test_suite }} --junit) + PASSTHROUGH=() if [ "${{ inputs.malloc }}" != "default" ]; then - MALLOC_ARG="--malloc=${{ inputs.malloc }}" + PASSTHROUGH+=(--malloc=${{ inputs.malloc }}) + fi + if [ -n "${{ inputs.extra_args }}" ]; then + PASSTHROUGH+=(${{ inputs.extra_args }}) fi - USER_ARGS="${{ inputs.extra_args }}" - if [ -n "$MALLOC_ARG" ] || [ -n "$USER_ARGS" ]; then - EXTRA_ARGS="-- $MALLOC_ARG $USER_ARGS" + if [ ${#PASSTHROUGH[@]} -gt 0 ]; then + ARGS+=(-- "${PASSTHROUGH[@]}") fi - xmake test -v -y --run=${{ inputs.test_suite }} --junit $EXTRA_ARGS + xmake "${ARGS[@]}" - name: Kill test processes if: always() @@ -257,16 +263,19 @@ jobs: - name: Build & Test run: | - EXTRA_ARGS="" - MALLOC_ARG="" + set -x + ARGS=(test -v -y --run=${{ inputs.test_suite }} --junit) + PASSTHROUGH=() if [ "${{ inputs.malloc }}" != "default" ]; then - MALLOC_ARG="--malloc=${{ inputs.malloc }}" + PASSTHROUGH+=(--malloc=${{ inputs.malloc }}) + fi + if [ -n "${{ inputs.extra_args }}" ]; then + PASSTHROUGH+=(${{ inputs.extra_args }}) fi - USER_ARGS="${{ inputs.extra_args }}" - if [ -n "$MALLOC_ARG" ] || [ -n "$USER_ARGS" ]; then - EXTRA_ARGS="-- $MALLOC_ARG $USER_ARGS" + if [ ${#PASSTHROUGH[@]} -gt 0 ]; then + ARGS+=(-- "${PASSTHROUGH[@]}") fi - xmake test -v -y --run=${{ inputs.test_suite }} --junit $EXTRA_ARGS + xmake "${ARGS[@]}" - name: Kill test processes if: always() |