Simpler Test code for handling SWIGLANG

This commit is contained in:
William S Fulton 2021-11-10 14:10:52 +00:00
commit 95c76a6fa6

View file

@ -276,9 +276,10 @@ jobs:
source $GITHUB_WORKSPACE/Tools/CI-linux-environment.sh source $GITHUB_WORKSPACE/Tools/CI-linux-environment.sh
set -x set -x
if test -z "$SWIGLANG"; then make $SWIGJOBS check-ccache; fi if test -z "$SWIGLANG"; then
if test -z "$SWIGLANG"; then make $SWIGJOBS check-errors-test-suite; fi make $SWIGJOBS check-ccache
make $SWIGJOBS check-errors-test-suite
else
case "$SWIGLANG" in case "$SWIGLANG" in
javascript) javascript)
case "$ENGINE" in case "$ENGINE" in
@ -293,12 +294,13 @@ jobs:
esac esac
# Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic. # 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 cflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags
if test -n "$SWIGLANG"; then cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags; fi cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags
if test -n "$SWIGLANG"; then make check-$SWIGLANG-version; fi make check-$SWIGLANG-version
if test -n "$SWIGLANG"; then make check-$SWIGLANG-enabled; fi make check-$SWIGLANG-enabled
if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi make $SWIGJOBS check-$SWIGLANG-examples CFLAGS="$cflags" CXXFLAGS="$cxxflags"
if test -n "$SWIGLANG"; then make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags"; fi make $SWIGJOBS check-$SWIGLANG-test-suite CFLAGS="$cflags" CXXFLAGS="$cxxflags"
fi
- name: Install - name: Install
working-directory: build/build working-directory: build/build