diff options
| -rw-r--r-- | .gitlab-ci.yml | 208 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtest.sh | 5 | ||||
| -rwxr-xr-x | tools/ci/scripts/runtests.sh | 38 |
3 files changed, 142 insertions, 109 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f93596f8..ec2bb0b70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,7 +67,7 @@ gcc-5_c++11_i386: stage: prebuild script: - ./tools/ci/jobs/gcc5_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -83,7 +83,7 @@ gcc-6-i386: stage: prebuild script: - ./tools/ci/jobs/gcc6.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -99,7 +99,7 @@ clang-3.9: stage: prebuild script: - ./tools/ci/jobs/clang39.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: clang-3.9 libc++-dev libc++abi-dev @@ -112,7 +112,7 @@ gcc-6: stage: prebuild script: - ./tools/ci/jobs/gcc6.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -125,7 +125,7 @@ gcc-4.4: stage: prebuild script: - ./tools/ci/jobs/gcc44.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:oldstable <<: *job-push variables: @@ -209,7 +209,7 @@ gcc-5_sdl2: stage: prebuild script: - ./tools/ci/jobs/gcc5_sdl2.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -222,7 +222,7 @@ gcc-6_game_only: stage: prebuild script: - ./tools/ci/jobs/gcc6.sh --without-dyecmd - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -450,7 +450,7 @@ gcc-5_sanitize: stage: build script: - ./tools/ci/jobs/gcc5_sanitize.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -465,7 +465,7 @@ gcc-6_sanitize: stage: build script: - ./tools/ci/jobs/gcc6_sanitize.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -480,7 +480,7 @@ gcc-6_sanitize_i386: stage: build script: - ./tools/ci/jobs/gcc6_sanitize.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -940,7 +940,7 @@ gcc-6_lto: stage: build script: - ./tools/ci/jobs/gcc6_lto.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -953,7 +953,7 @@ gcc-6_lto_i386: stage: build script: - ./tools/ci/jobs/gcc6_lto.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1011,7 +1011,7 @@ gcc-3_sdl1: stage: build script: - ./tools/ci/jobs/gcc3.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl1 <<: *job-push variables: @@ -1024,7 +1024,7 @@ gcc-3_sdl2: stage: build script: - ./tools/ci/jobs/gcc3.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl2 <<: *job-push variables: @@ -1037,7 +1037,7 @@ gcc-4.1_sdl1: stage: build script: - ./tools/ci/jobs/gcc41.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1 <<: *job-push variables: @@ -1052,7 +1052,7 @@ gcc-4.1_sdl2: stage: build script: - ./tools/ci/jobs/gcc41.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl2 <<: *job-push variables: @@ -1067,7 +1067,7 @@ gcc-4.3_sdl1: stage: build script: - ./tools/ci/jobs/gcc43.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1 <<: *job-push variables: @@ -1082,7 +1082,7 @@ gcc-4.3_sdl2: stage: build script: - ./tools/ci/jobs/gcc43.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl2 <<: *job-push variables: @@ -1097,7 +1097,7 @@ gcc-4.4_i386: stage: build script: - ./tools/ci/jobs/gcc44.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:oldstable-i386 <<: *job-push variables: @@ -1113,7 +1113,7 @@ gcc-4.5: stage: build script: - ./tools/ci/jobs/gcc45.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: ubuntu:12.04 <<: *job-push variables: @@ -1129,7 +1129,7 @@ gcc-4.6: stage: build script: - ./tools/ci/jobs/gcc46.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:oldstable <<: *job-push variables: @@ -1145,7 +1145,7 @@ gcc-4.6_i386: stage: build script: - ./tools/ci/jobs/gcc46.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:oldstable-i386 <<: *job-push variables: @@ -1161,7 +1161,7 @@ gcc-4.7: stage: build script: - ./tools/ci/jobs/gcc47.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:oldstable <<: *job-push variables: @@ -1177,7 +1177,7 @@ gcc-4.7_i386: stage: build script: - ./tools/ci/jobs/gcc47.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:oldstable-i386 <<: *job-push variables: @@ -1193,7 +1193,7 @@ gcc-4.7_c++11: stage: build script: - ./tools/ci/jobs/gcc47_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:oldstable <<: *job-push variables: @@ -1209,7 +1209,7 @@ gcc-4.8: stage: build script: - ./tools/ci/jobs/gcc48.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1223,7 +1223,7 @@ gcc-4.8_i386: stage: build script: - ./tools/ci/jobs/gcc48.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:stable-i386 <<: *job-push variables: @@ -1239,7 +1239,7 @@ clang-3.0: stage: build script: - ./tools/ci/jobs/clang.sh clang - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:oldstable <<: *job-push variables: @@ -1255,7 +1255,7 @@ clang-3.0_i386: stage: build script: - ./tools/ci/jobs/clang.sh clang - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:oldstable-i386 <<: *job-push variables: @@ -1271,7 +1271,7 @@ clang-3.3: stage: build script: - ./tools/ci/jobs/clang.sh clang-3.3 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: ubuntu:12.04 <<: *job-push variables: @@ -1287,7 +1287,7 @@ clang-3.3_i386: stage: build script: - ./tools/ci/jobs/clang.sh clang-3.3 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/ubuntu:precise-i386 <<: *job-push variables: @@ -1303,7 +1303,7 @@ clang-3.4: stage: build script: - ./tools/ci/jobs/clang34.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1317,7 +1317,7 @@ clang-3.4_i386: stage: build script: - ./tools/ci/jobs/clang34.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:stable-i386 <<: *job-push variables: @@ -1333,7 +1333,7 @@ clang-3.5: stage: build script: - ./tools/ci/jobs/clang35.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1347,7 +1347,7 @@ clang-3.5_i386: stage: build script: - ./tools/ci/jobs/clang35.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:stable-i386 <<: *job-push variables: @@ -1363,7 +1363,7 @@ clang-3.6: stage: build script: - ./tools/ci/jobs/clang36.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: ubuntu:14.04 <<: *job-push variables: @@ -1379,7 +1379,7 @@ clang-3.6_i386: stage: build script: - ./tools/ci/jobs/clang36.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/ubuntu:trusty-i386 <<: *job-push variables: @@ -1395,7 +1395,7 @@ clang-3.7: stage: build script: - ./tools/ci/jobs/clang37.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: ubuntu:16.04 <<: *job-push variables: @@ -1411,7 +1411,7 @@ clang-3.7_i386: stage: build script: - ./tools/ci/jobs/clang37.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/ubuntu:xenial-i386 <<: *job-push variables: @@ -1427,7 +1427,7 @@ clang-3.8: stage: build script: - ./tools/ci/jobs/clang38.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: ubuntu:16.04 <<: *job-push variables: @@ -1443,7 +1443,7 @@ clang-3.8_i386: stage: build script: - ./tools/ci/jobs/clang38.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/ubuntu:xenial-i386 <<: *job-push variables: @@ -1459,7 +1459,7 @@ clang-3.8_i386: stage: build script: - ./tools/ci/jobs/clang39.sh_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: clang-3.9 libc++-dev libc++abi-dev @@ -1472,7 +1472,7 @@ clang-3.8_i386: stage: build script: - ./tools/ci/jobs/clang39.sh_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1488,7 +1488,7 @@ gcc-6_all_and_unittestsbin: stage: build script: - ./tools/ci/jobs/gcc6_silent.sh --enable-unittestsbin - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1501,7 +1501,7 @@ gcc-4.8_c++11: stage: build script: - ./tools/ci/jobs/gcc48_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1515,7 +1515,7 @@ gcc-4.9: stage: build script: - ./tools/ci/jobs/gcc49.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1529,7 +1529,7 @@ gcc-4.9_i386: stage: build script: - ./tools/ci/jobs/gcc49.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:stable-i386 <<: *job-push variables: @@ -1545,7 +1545,7 @@ gcc-4.9_c++11: stage: build script: - ./tools/ci/jobs/gcc49_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1559,7 +1559,7 @@ cmake_gcc-4.9: stage: build script: - ./tools/ci/jobs/cmake_gcc49.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1575,7 +1575,7 @@ clang-4.0: stage: build script: - ./tools/ci/jobs/clang40.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: clang-4.0 libc++-dev libc++abi-dev @@ -1590,7 +1590,7 @@ gcc-5: stage: build script: - ./tools/ci/jobs/gcc5.sh --enable-werror - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1603,7 +1603,7 @@ gcc-5_c++11: stage: build script: - ./tools/ci/jobs/gcc5_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1616,7 +1616,7 @@ gcc-5_sdl2_c++11: stage: build script: - ./tools/ci/jobs/gcc5_sdl2_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1629,7 +1629,7 @@ gcc-5_sdl2_c++11_i386: stage: build script: - ./tools/ci/jobs/gcc5_sdl2_c++11.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1645,7 +1645,7 @@ gcc-snapshot: stage: build script: - ./tools/ci/jobs/gccsnapshot.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-snapshot @@ -1658,7 +1658,7 @@ gcc-snapshot_i386: stage: build script: - ./tools/ci/jobs/gccsnapshot.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1674,7 +1674,7 @@ gcc-snapshot_sdl2: stage: build script: - ./tools/ci/jobs/gccsnapshot_sdl2.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-snapshot @@ -1687,7 +1687,7 @@ gcc-snapshot_sdl2_i386: stage: build script: - ./tools/ci/jobs/gccsnapshot_sdl2.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1703,7 +1703,7 @@ gcc_without_mumble: stage: build script: - ./tools/ci/jobs/gcc5.sh --without-mumble --enable-werror - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1716,7 +1716,7 @@ gcc_with_customnls: stage: build script: - ./tools/ci/jobs/gcc5.sh --enable-customnls --enable-werror - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1729,7 +1729,7 @@ gcc_wit_customnls_nonls: stage: build script: - ./tools/ci/jobs/gcc5.sh --enable-customnls --disable-nls --enable-werror - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1742,7 +1742,7 @@ gcc49_cilkplus: stage: build script: - ./tools/ci/jobs/gcc49.sh --enable-cilkplus - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1756,7 +1756,7 @@ gcc-5_cilkplus: stage: build script: - ./tools/ci/jobs/gcc5.sh --enable-cilkplus - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-5 g++-5 @@ -1769,7 +1769,7 @@ gcc-6_cilkplus: stage: build script: - ./tools/ci/jobs/gcc6.sh --enable-cilkplus - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1782,7 +1782,7 @@ gcc-6_pugixml: stage: build script: - ./tools/ci/jobs/gcc6.sh --enable-libxml=pugixml - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1795,7 +1795,7 @@ gcc-6_pugixml_i386: stage: build script: - ./tools/ci/jobs/gcc6.sh --enable-libxml=pugixml - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: vicamo/debian:sid-i386 <<: *job-push variables: @@ -1809,7 +1809,7 @@ gcc-6_pugixml_sdl2: stage: build script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-libxml=pugixml - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1822,7 +1822,7 @@ gcc-6_pugixml_sdl2_i386: stage: build script: - ./tools/ci/jobs/gcc6.sh --with-sdl2 --enable-libxml=pugixml - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1835,7 +1835,7 @@ gcc_portable: stage: build script: - ./tools/ci/jobs/gcc6.sh --with-opengl --enable-tmwa --enable-portable=yes - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1848,7 +1848,7 @@ clang-3.9_sdl2: stage: build script: - ./tools/ci/jobs/clang39_sdl2.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: clang-3.9 libc++-dev libc++abi-dev @@ -1861,7 +1861,7 @@ gcc-6_no_asserts: stage: build script: - ./tools/ci/jobs/gcc6.sh --disable-asserts - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -1874,7 +1874,7 @@ gcc-4.8_sdl2: stage: build script: - ./tools/ci/jobs/gcc48.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1888,7 +1888,7 @@ gcc-4.9_sdl2: stage: build script: - ./tools/ci/jobs/gcc49.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh image: debian:stable <<: *job-push variables: @@ -1969,7 +1969,7 @@ fedora_gcc-snapshot: stage: build script: - ./tools/ci/jobs/gccsnapshot.sh - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push image: fedora:rawhide variables: @@ -1982,7 +1982,7 @@ fedora_gcc-snapshot_sdl2: stage: build script: - ./tools/ci/jobs/gccsnapshot.sh --with-sdl2 - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push image: fedora:rawhide variables: @@ -1999,7 +1999,7 @@ gcc-6_zlib_v1.2.3.9: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2019,7 +2019,7 @@ gcc-6_zlib_v1.2.6.1: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2039,7 +2039,7 @@ gcc-6_zlib_v1.2.9: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2058,7 +2058,7 @@ gcc-6_zlib_v1.2.10: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2077,7 +2077,7 @@ gcc-6_zlib_v1.2.11: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2096,7 +2096,7 @@ gcc-6_zlib_master: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2115,7 +2115,7 @@ gcc-6_zlib_develop: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib @@ -2135,7 +2135,7 @@ gcc-6_zlib_develop: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: zlib_ng @@ -2154,7 +2154,7 @@ gcc-6_libpng_master: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2173,7 +2173,7 @@ gcc-6_libpng_libpng17: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2192,7 +2192,7 @@ gcc-6_libpng_libpng16: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2211,7 +2211,7 @@ gcc-6_libpng_libpng15: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2230,7 +2230,7 @@ gcc-6_libpng_libpng14: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2249,7 +2249,7 @@ gcc-6_libpng_libpng12: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2268,7 +2268,7 @@ gcc-6_libpng_libpng10: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: libpng @@ -2287,7 +2287,7 @@ gcc-6_curl_curl-7_9_8: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: curl @@ -2306,7 +2306,7 @@ gcc-6_curl_curl-7_40_0: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: curl @@ -2325,7 +2325,7 @@ gcc-6_curl_curl-7_52_1: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: curl @@ -2344,7 +2344,7 @@ gcc-6_curl_curl-7_53_1: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/jobs/gcc6.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/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: curl @@ -2365,7 +2365,7 @@ gcc-6_SDL_SDL-1.2: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: SDL @@ -2385,7 +2385,7 @@ gcc-6_SDL_default: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: SDL @@ -2448,7 +2448,7 @@ gcc-6_SDL_SDL-1.2_old: - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} env - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6.sh - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: SDL @@ -2470,7 +2470,7 @@ gcc-6_SDL_default_old: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6.sh --with-sdl2 - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaplus - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh <<: *job-push variables: LIBNAME: SDL @@ -2539,7 +2539,7 @@ gcc-6_SDL_SDL-1.2_sanitize: - 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/gcc6_sanitize.sh - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: @@ -2560,7 +2560,7 @@ gcc-6_SDL_default_sanitize: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize.sh --with-sdl2 - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: @@ -2584,7 +2584,7 @@ gcc-6_SDL_SDL-1.2_old_sanitize: - 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/gcc6_sanitize.sh - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: @@ -2607,7 +2607,7 @@ gcc-6_SDL_default_old_sanitize: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc6_sanitize.sh --with-sdl2 - - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtest.sh + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/runtests.sh - ldd ./src/manaplus | grep "libasan" <<: *job-push variables: @@ -2629,7 +2629,7 @@ gcc-6_openglerrors_i386: stage: build script: - ./tools/ci/jobs/gcc6.sh --enable-openglerrors - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push image: vicamo/debian:sid-i386 variables: @@ -2643,7 +2643,7 @@ gcc-6_openglerrors: stage: build script: - ./tools/ci/jobs/gcc6.sh --enable-openglerrors - - ./tools/ci/scripts/runtest.sh + - ./tools/ci/scripts/runtests.sh <<: *job-push variables: PACKAGES: gcc-6 g++-6 diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 2c5a8a012..80b54a0ff 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -1,10 +1,5 @@ #!/bin/bash -export SDL_VIDEODRIVER="dummy" -ulimit -c unlimited -S -ulimit -c unlimited -rm -rf core* - ./src/manaplus --renderer=0 >logs/run.log 2>&1 & export PID=$! sleep 12s diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh new file mode 100755 index 000000000..80809fc55 --- /dev/null +++ b/tools/ci/scripts/runtests.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +export SDL_VIDEODRIVER="dummy" +ulimit -c unlimited -S +ulimit -c unlimited +rm -rf core* + +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" + ./tools/ci/scripts/runtest.sh + if [ "$?" != 0 ]; then + exit 1 + fi + if [[ $n -ge 5 ]]; then + exit 0 + fi + sleep 5s + n=$((n+1)) +done + +echo "existing config runs" +n=0 +while true; do + echo "run test ${n}" + ./tools/ci/scripts/runtest.sh + if [ "$?" != 0 ]; then + exit 1 + fi + if [[ $n -ge 5 ]]; then + exit 0 + fi + sleep 5s + n=$((n+1)) +done |