diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2021-11-10 14:10:52 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2021-11-11 20:17:50 +0000 |
| commit | 95c76a6fa60ce846826a8bd4b2dc41e7f56cf294 (patch) | |
| tree | b10c2c16b971747ccd1a707248c834338379948d | |
| parent | 1bd3e771a08ab9b4240b410904cdea9188ef77f3 (diff) | |
| download | swig-95c76a6fa60ce846826a8bd4b2dc41e7f56cf294.tar.gz | |
Simpler Test code for handling SWIGLANG
| -rw-r--r-- | .github/workflows/ci.yml | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e08a5f06..0e1ebbe25 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -276,29 +276,31 @@ jobs: source $GITHUB_WORKSPACE/Tools/CI-linux-environment.sh set -x - if test -z "$SWIGLANG"; then make $SWIGJOBS check-ccache; fi - if test -z "$SWIGLANG"; then make $SWIGJOBS check-errors-test-suite; fi - - case "$SWIGLANG" in - javascript) - case "$ENGINE" in - v8 | jsc) - # Running tests using v8 or jsc involves creating a custom - # interpreter in Tools/javascript, which is currently broken - # for parallel builds (we attempt to update this interpreter - # while running, resulting in "Text file busy" error). - unset SWIGJOBS - esac - ;; - esac + if test -z "$SWIGLANG"; then + make $SWIGJOBS check-ccache + make $SWIGJOBS check-errors-test-suite + else + case "$SWIGLANG" in + javascript) + case "$ENGINE" in + v8 | jsc) + # Running tests using v8 or jsc involves creating a custom + # interpreter in Tools/javascript, which is currently broken + # for parallel builds (we attempt to update this interpreter + # while running, resulting in "Text file busy" error). + unset SWIGJOBS + esac + ;; + esac - # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic. - if test -n "$SWIGLANG"; then cflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags; fi - if test -n "$SWIGLANG"; then cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags; fi - if test -n "$SWIGLANG"; then make check-$SWIGLANG-version; fi - if test -n "$SWIGLANG"; then make check-$SWIGLANG-enabled; fi - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi - if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi + # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic. + cflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags + cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags + make check-$SWIGLANG-version + make check-$SWIGLANG-enabled + make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags" + make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags" + fi - name: Install working-directory: build/build |