diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ci/disabled.gitlab-ci.yml | 386 | ||||
| -rwxr-xr-x | tools/ci/scripts/exit.sh | 2 | ||||
| -rwxr-xr-x | tools/ci/scripts/init.sh | 28 | ||||
| -rwxr-xr-x | tools/ci/scripts/rundyecmd.sh | 4 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtests.sh | 27 | ||||
| -rwxr-xr-x | tools/ci/scripts/separateunittests.sh | 2 |
6 files changed, 424 insertions, 25 deletions
diff --git a/tools/ci/disabled.gitlab-ci.yml b/tools/ci/disabled.gitlab-ci.yml new file mode 100644 index 000000000..19aa0012d --- /dev/null +++ b/tools/ci/disabled.gitlab-ci.yml @@ -0,0 +1,386 @@ +# Disabled: drop 1386 support +.gcc-5_c++11_i386: + stage: prebuild + script: + - ./tools/ci/scripts/patchsdl1.sh + - ./tools/ci/jobs/gcc5_c++11.sh + - ./tools/ci/scripts/runtests.sh + image: i386/ubuntu:xenial + <<: *job-push + variables: + PACKAGES: gcc-5 g++-5 + make autoconf automake autopoint gettext + libxml2-dev libcurl4-gnutls-dev libpng-dev + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + gdb valgrind netcat-openbsd procps + tags: + - docker + +# Disabled: drop 1386 support +.gcc-5_h_all_i386: + stage: prebuild + script: + - ./tools/ci/scripts/patchsdl1.sh + - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -DUNITTESTS -DUNITTESTS_CATCH -DUNITTESTS_EMBED -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DTMWA_SUPPORT -DENABLE_NLS -DENABLE_LIBXML -I/usr/include/SDL + - ./tools/ci/jobs/gcc5_h.sh -std=c++0x -DDEBUGBUILD -DENABLE_NLS -DUSE_OPENGL -DENABLE_LIBXML -I/usr/include/SDL + image: i386/ubuntu:xenial + <<: *job-push + variables: + PACKAGES: gcc-5 g++-5 + make autoconf automake autopoint gettext + libxml2-dev libcurl4-gnutls-dev libpng-dev + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + tags: + - docker + +# Disabled: drop 1386 support +.gcc-8-i386: + stage: prebuild + script: + - ./tools/ci/scripts/patchsdl1.sh + - ./tools/ci/jobs/gcc8.sh + - ./tools/ci/scripts/runtests.sh + image: i386/debian:buster + <<: *job-push + variables: + PACKAGES: gcc-8 g++-8 + make autoconf automake autopoint gettext + libxml2-dev libcurl4-gnutls-dev libpng-dev + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + gdb valgrind netcat-openbsd procps + tags: + - docker + +# Disabled: drop 1386 support +.gcc-10-i386: + stage: prebuild + script: + - ./tools/ci/scripts/patchsdl1.sh + - ./tools/ci/jobs/gcc10.sh + - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh + image: i386/debian:unstable + <<: *job-push + variables: + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext + libxml2-dev libcurl4-gnutls-dev libpng-dev + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + gdb valgrind netcat-openbsd procps + tags: + - docker + +# Disabled: manaplus/manaplus only (win32) +mxe_gcc6_shared_32: + only: + - branches@manaplus/manaplus + stage: prebuild + script: + - ls /mxe + - ./tools/ci/jobs/mxe_gcc6.sh + <<: *job-push + image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 + variables: + PACKAGES: bash + CROSS: i686-w64-mingw32.shared + tags: + - docker + +# Disabled: manaplus/manaplus only (win64) +mxe_gcc6_shared_64: + only: + - branches@manaplus/manaplus + stage: prebuild + script: + - ls /mxe + - ./tools/ci/jobs/mxe_gcc6.sh + <<: *job-push + image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 + variables: + PACKAGES: bash + CROSS: x86_64-w64-mingw32.shared + tags: + - docker + +# Disabled: manaplus/manaplus only +triggers: + stage: build + only: + - branches@manaplus/manaplus + script: + - ./tools/ci/scripts/triggers.sh + <<: *job-push + variables: + PACKAGES: curl + +# disabled due gitlab bug +.gcc-10_SDL_SDL-1.2_sanitize2_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} + - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - export LD_PRELOAD + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: SDL-1.2_asan + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev + valgrind + wget unzip + JOBS: 1 + ASAN_OPTIONS: "detect_leaks=0" + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_default_sanitize2_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.4 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - export LD_PRELOAD + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: default_asan + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind + wget unzip + JOBS: 1 + ASAN_OPTIONS: "detect_leaks=0" + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_SDL-1.2_sanitize_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: SDL-1.2 + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev + valgrind + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_default_sanitize_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: default + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + + +# disabled due gitlab bug +.gcc-10_SDL_SDL-1.2_old_sanitize_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: SDL-1.2_old + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev + valgrind + libjpeg-dev libtiff-dev + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh + POST_CXXFLAGS: "-Wno-undef" + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_default_old_sanitize_test: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaplusgame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplustests + - ldd ./src/manaplustests | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: default_old + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind + libjpeg-dev libtiff-dev + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh + POST_CXXFLAGS: "-Wno-undef" + tags: + - docker + +# error compilation. cant find SDL. +.gcc-10_zlib_ng_develop: + stage: build + script: + - ./tools/ci/scripts/patchsdl1.sh + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc10.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/checkldd.sh src/manaplus + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh + <<: *job-push + variables: + LIBNAME: zlib_ng + LIBVERSION: develop + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext + libxml2-dev libcurl4-gnutls-dev libpng-dev + libsdl-gfx1.2-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-net1.2-dev libsdl-ttf2.0-dev + wget unzip gdb valgrind netcat-openbsd procps + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_SDL-1.2_sanitize: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh + - ldd ./src/manaplus | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: SDL-1.2 + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev + valgrind netcat-openbsd + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_default_sanitize: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh + - ldd ./src/manaplus | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: default + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind netcat-openbsd + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_master.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_master.sh + tags: + - docker + + +# disabled due gitlab bug +.gcc-10_SDL_SDL-1.2_old_sanitize: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh + - ldd ./src/manaplus | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: SDL-1.2_old + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libglu1-mesa-dev libicu-dev + valgrind netcat-openbsd + libjpeg-dev libtiff-dev + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh + POST_CXXFLAGS: "-Wno-undef" + tags: + - docker + +# disabled due gitlab bug +.gcc-10_SDL_default_old_sanitize: + stage: build + script: + - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize.sh --with-sdl2 + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh + - ldd ./src/manaplus | grep "libasan" + <<: *job-push + variables: + LIBNAME: SDL + LIBVERSION: default_old + PACKAGES: gcc-10 g++-10 + make autoconf automake autopoint gettext pkg-config + libx11-dev libxext-dev libxt-dev libxv-dev x11proto-core-dev libgl1-mesa-dev libasound2-dev libicu-dev + valgrind netcat-openbsd + libjpeg-dev libtiff-dev + wget unzip + runenvz: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runzlib_v1.2.5.sh + runenvx: /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runlibxml2_v2.9.1.sh + POST_CXXFLAGS: "-Wno-undef" + tags: + - docker diff --git a/tools/ci/scripts/exit.sh b/tools/ci/scripts/exit.sh index 1f13618c1..d06219a4f 100755 --- a/tools/ci/scripts/exit.sh +++ b/tools/ci/scripts/exit.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -rm $ERRFILE +silent_rm $ERRFILE diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index f427be910..92becc23b 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -3,7 +3,13 @@ export dir=$(pwd) export ERRFILE=${dir}/logs/${LOGFILE} -rm ${ERRFILE} +function silent_rm { + if [[ -f "$1" ]]; then + rm "$1" + fi +} + +silent_rm ${ERRFILE} function do_init { $CC --version @@ -147,11 +153,11 @@ function check_error { } function run_configure_simple { - rm $ERRFILE + silent_rm $ERRFILE echo "autoreconf -i" autoreconf -i 2>$ERRFILE check_error $? - rm $ERRFILE + silent_rm $ERRFILE echo "./configure $*" ./configure $* 2>$ERRFILE check_error $? @@ -160,14 +166,14 @@ function run_configure_simple { function run_configure { run_configure_simple $* - rm $ERRFILE + silent_rm $ERRFILE cd po echo "make update-gmo" make update-gmo 2>$ERRFILE check_error $? cd .. - rm $ERRFILE + silent_rm $ERRFILE cd po echo "make update-po" make update-po 2>$ERRFILE @@ -176,14 +182,14 @@ function run_configure { } function run_cmake { - rm $ERRFILE + silent_rm $ERRFILE echo "cmake ." cmake . 2>$ERRFILE check_error $? } function run_make { - rm $ERRFILE + silent_rm $ERRFILE if [ "$JOBS" == "" ]; then export JOBS=2 echo "No JOBS defined" @@ -196,7 +202,7 @@ function run_make { } function run_make_check { - rm $ERRFILE + silent_rm $ERRFILE if [ "$JOBS" == "" ]; then export JOBS=2 echo "No JOBS defined" @@ -256,7 +262,7 @@ function run_check_warnings { } function run_h { - rm $ERRFILE + silent_rm $ERRFILE echo "$CC -c -x c++ $* $includes */*/*/*/*.h */*/*/*.h */*/*.h */*.h *.h" $CC -c -x c++ $* $includes */*/*/*/*.h */*/*/*.h */*/*.h */*.h *.h 2>$ERRFILE DATA=$(cat $ERRFILE) @@ -268,7 +274,7 @@ function run_h { } function run_tarball { - rm $ERRFILE + silent_rm $ERRFILE echo "make dist-xz" make dist-xz 2>$ERRFILE check_error $? @@ -281,7 +287,7 @@ function run_tarball { } function run_mplint { - rm $ERRFILE + silent_rm $ERRFILE echo "mplint/src/mplint $*" mplint/src/mplint $* \ | grep -v "src/unittests/doctest.h" \ diff --git a/tools/ci/scripts/rundyecmd.sh b/tools/ci/scripts/rundyecmd.sh index fc399f822..00001452a 100755 --- a/tools/ci/scripts/rundyecmd.sh +++ b/tools/ci/scripts/rundyecmd.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash function testdye { - rm test1.png || true + silent_rm test1.png || true echo ./src/dyecmd "data/icons/manaplus.png|$1" test1.png ./src/dyecmd "data/icons/manaplus.png|$1" test1.png || exit 1 ls test1.png || exit 1 - rm test1.png || true + silent_rm test1.png || true } export SDL_VIDEODRIVER="dummy" diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh index 9f0a6729f..528ea69cc 100755 --- a/tools/ci/scripts/runtests.sh +++ b/tools/ci/scripts/runtests.sh @@ -1,5 +1,11 @@ #!/usr/bin/env bash +if [[ $1 != "" ]]; then + N_RUNS=$1 +else + N_RUNS=3 +fi + if [[ "$RUNFROMSHELL" != "" ]]; then if [[ ${CIRRUS_CI} != "true" ]]; then echo "Running from shell. Skipping run tests $*" @@ -21,18 +27,19 @@ export ASAN_OPTIONS=detect_stack_use_after_return=true:strict_init_order=true echo "clean config runs" n=0 while true; do - echo "run test ${n}" - rm "${HOME}/.config/mana/mana/config.xml" - rm "/root/.config/mana/mana/config.xml" - rm "${HOME}/.config/mana/mana/serverlistplus.xml" - rm "/root/.config/mana/mana/serverlistplus.xml" - rm "${HOME}/.local/share/mana/manaplus.log" - rm "/root/.local/share/mana/manaplus.log" + echo "run test ${n}/${N_RUNS}" + echo "clean configs and logs" + silent_rm "${HOME}/.config/mana/mana/config.xml" + silent_rm "/root/.config/mana/mana/config.xml" + silent_rm "${HOME}/.config/mana/mana/serverlistplus.xml" + silent_rm "/root/.config/mana/mana/serverlistplus.xml" + silent_rm "${HOME}/.local/share/mana/manaplus.log" + silent_rm "/root/.local/share/mana/manaplus.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 fi - if [[ $n -ge 3 ]]; then + if [[ $n -ge $N_RUNS ]]; then break fi sleep 5 @@ -45,8 +52,8 @@ echo "existing config runs" n=0 while true; do echo "run test ${n}" - rm "${HOME}/.local/share/mana/manaplus.log" - rm "/root/.local/share/mana/manaplus.log" + silent_rm "${HOME}/.local/share/mana/manaplus.log" + silent_rm "/root/.local/share/mana/manaplus.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 diff --git a/tools/ci/scripts/separateunittests.sh b/tools/ci/scripts/separateunittests.sh index 3e94272da..493ce4ab4 100755 --- a/tools/ci/scripts/separateunittests.sh +++ b/tools/ci/scripts/separateunittests.sh @@ -13,7 +13,7 @@ for str in $(cat ${LIST}) do unset IFS declare -a "arr=($str)" - rm -rf "${HOME}" + silent_rm -rf "${HOME}" mkdir "${HOME}" echo ./src/manaplustests --test-case=\"${arr[0]}\" --subcase=\"${arr[1]}\" ./src/manaplustests --test-case="${arr[0]}" --subcase="${arr[1]}" || exit 1 |