diff options
| author | jak1 <jak1@themanaworld.org> | 2023-01-08 15:31:42 +0100 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2024-02-08 21:48:54 -0300 |
| commit | 1d56e8f96def89ebcdd59ae85932353b52a973ec (patch) | |
| tree | be14e679babc650f5db61af73ec53e0080735bad /tools | |
| parent | 804ff57328837c09a692ddbe2d3ebb755d57a7c8 (diff) | |
| download | mv-1d56e8f96def89ebcdd59ae85932353b52a973ec.tar.gz mv-1d56e8f96def89ebcdd59ae85932353b52a973ec.tar.bz2 mv-1d56e8f96def89ebcdd59ae85932353b52a973ec.tar.xz mv-1d56e8f96def89ebcdd59ae85932353b52a973ec.zip | |
[WIP] renamed the client to ManaVerse
removed evol, since its not developed anymore... only leads to confusing players
removed that anoying 'broken nick detected' message (regulare player don't care what crap the server sends)
updated copyright -2020 for manaplus
* Updated in 2024-02-08 with conflicts by Jesusalva
Diffstat (limited to 'tools')
44 files changed, 326 insertions, 326 deletions
diff --git a/tools/ci/branches/.gitlab-ci_header.yml b/tools/ci/branches/.gitlab-ci_header.yml index faeae1416..122e1d3d7 100644 --- a/tools/ci/branches/.gitlab-ci_header.yml +++ b/tools/ci/branches/.gitlab-ci_header.yml @@ -12,7 +12,7 @@ before_script: - ":; ${DOCKERRETRY} ${PMUPDATE} >logs/apt.log" - ":; ${DOCKERRETRY} ${PMINSTALL} ${PACKAGES} >>logs/apt.log" - ":; ./tools/ci/scripts/clonesrc.sh" - - ":; cd manaplus" + - ":; cd manaverse" image: debian:unstable diff --git a/tools/ci/branches/ci_checks/.gitlab-ci.yml b/tools/ci/branches/ci_checks/.gitlab-ci.yml index 57aa9ac1d..3864a34d8 100644 --- a/tools/ci/branches/ci_checks/.gitlab-ci.yml +++ b/tools/ci/branches/ci_checks/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml index ebc9c99e1..e2b326ea7 100644 --- a/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang4_5/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_clang6/.gitlab-ci.yml b/tools/ci/branches/ci_clang6/.gitlab-ci.yml index 0ec29486d..c6542a05b 100644 --- a/tools/ci/branches/ci_clang6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang6/.gitlab-ci.yml @@ -18,7 +18,7 @@ clang-6.0_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: debian:bullseye variables: @@ -34,7 +34,7 @@ clang-6.0_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:bullseye variables: @@ -49,7 +49,7 @@ clang-6.0_tests_i386: clang-6.0_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: debian:bullseye variables: @@ -64,7 +64,7 @@ clang-6.0_tests_sdl2: clang-6.0_tests_sdl2_i386: stage: build script: - - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang60_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:bullseye variables: diff --git a/tools/ci/branches/ci_clang7/.gitlab-ci.yml b/tools/ci/branches/ci_clang7/.gitlab-ci.yml index fd92572f6..26ac78154 100644 --- a/tools/ci/branches/ci_clang7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang7/.gitlab-ci.yml @@ -18,7 +18,7 @@ clang-7.0_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: debian:buster variables: @@ -34,7 +34,7 @@ clang-7.0_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: @@ -49,7 +49,7 @@ clang-7.0_tests_i386: clang-7.0_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: debian:buster variables: @@ -64,7 +64,7 @@ clang-7.0_tests_sdl2: clang-7.0_tests_sdl2_i386: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: diff --git a/tools/ci/branches/ci_fedora/.gitlab-ci.yml b/tools/ci/branches/ci_fedora/.gitlab-ci.yml index 125b2f9d2..50523bc6f 100644 --- a/tools/ci/branches/ci_fedora/.gitlab-ci.yml +++ b/tools/ci/branches/ci_fedora/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,8 +20,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push image: fedora:rawhide variables: @@ -34,8 +34,8 @@ .fedora_gcc-snapshot_sanitize_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gccsnapshot_sanitize_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push image: fedora:rawhide variables: @@ -49,7 +49,7 @@ fedora_gcc-snapshot_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gccsnapshot_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: fedora:rawhide variables: @@ -62,7 +62,7 @@ fedora_gcc-snapshot_tests: fedora_gcc-snapshot_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gccsnapshot_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gccsnapshot_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: fedora:rawhide variables: diff --git a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml index 91d5117f4..d59a664dd 100644 --- a/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc-snapshot/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml index 9acfd5a02..f5c71e33d 100644 --- a/tools/ci/branches/ci_gcc10/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml index 48caf86ff..1bdc1ade7 100644 --- a/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc10_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -21,8 +21,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -39,8 +39,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -56,7 +56,7 @@ gcc-10_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-10_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -88,7 +88,7 @@ gcc-10_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-10_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-10_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O10 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-10_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-10_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-10_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -185,7 +185,7 @@ gcc-10_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -199,7 +199,7 @@ gcc-10_tests: gcc-10_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,9 +215,9 @@ gcc-10_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true <<: *job-push variables: @@ -233,9 +233,9 @@ gcc-10_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: i386/debian:unstable <<: *job-push @@ -252,7 +252,7 @@ gcc-10_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,9 +266,9 @@ gcc-10_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -291,9 +291,9 @@ gcc-10_separate_doctest_sanitize: gcc-10_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -317,7 +317,7 @@ gcc-10_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -333,7 +333,7 @@ gcc-10_separate_doctest_i386: gcc-10_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -364,7 +364,7 @@ gcc-10_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -380,7 +380,7 @@ gcc-10_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -396,7 +396,7 @@ gcc-10_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -411,7 +411,7 @@ gcc-10_unsigned_char_tests: gcc-10_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc10_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml index 82b58be9b..958775269 100644 --- a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -22,7 +22,7 @@ gcc-3_sdl1: - ./tools/ci/jobs/gcc3.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -36,7 +36,7 @@ gcc-3_sdl2: - ./tools/ci/jobs/gcc3.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc3_sdl2 <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml index d5e2872df..2f2281737 100644 --- a/tools/ci/branches/ci_gcc49/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc49/.gitlab-ci.yml @@ -18,7 +18,7 @@ gcc-4.9_sanitize_tests: stage: build script: - ./tools/ci/jobs/gcc49_sanitize_tests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" image: debian:jessie <<: *job-push variables: @@ -34,7 +34,7 @@ gcc-4.9_sanitize_tests_i386: stage: build script: - ./tools/ci/jobs/gcc49_sanitize_tests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" image: i386/debian:jessie <<: *job-push variables: @@ -93,8 +93,8 @@ gcc-4.9_sdl2_sanitize: gentoo_gcc-4.9_tests: stage: build script: - - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame - image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl1 + - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaversegame + image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -107,8 +107,8 @@ gentoo_gcc-4.9_tests: gentoo_gcc-4.9_tests_sdl2: stage: build script: - - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaplusgame --with-sdl2 - image: registry.gitlab.com/manaplus/images:gentoo_gcc49_sdl2 + - ./tools/ci/jobs/gcc49_tests.sh --without-dyecmd --without-manaversegame --with-sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc49_sdl2 <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml index c657d6e08..f61d3385d 100644 --- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml @@ -37,7 +37,7 @@ gcc-4.1_sdl1: - ./tools/ci/jobs/gcc41.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -53,7 +53,7 @@ gcc-4.1_sdl2: - ./tools/ci/jobs/gcc41.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc41_sdl2 <<: *job-push variables: PMUPDATE: "echo" @@ -69,7 +69,7 @@ gcc-4.3_sdl1: - ./tools/ci/jobs/gcc43.sh - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl1 <<: *job-push variables: PMUPDATE: "echo" @@ -85,7 +85,7 @@ gcc-4.3_sdl2: - ./tools/ci/jobs/gcc43.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh - ./tools/ci/scripts/rundyecmd.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc43_sdl2 <<: *job-push variables: PMUPDATE: "echo" diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml index 63c86ffa1..eabeb89bc 100644 --- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -54,7 +54,7 @@ gcc-5_sanitize_tests: script: - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/gcc5_sanitize_tests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" image: ubuntu:xenial <<: *job-push variables: @@ -71,8 +71,8 @@ gcc-5_sanitize_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" image: i386/ubuntu:xenial <<: *job-push variables: @@ -88,8 +88,8 @@ gcc-5_sanitize_no_opengl_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" image: ubuntu:xenial <<: *job-push variables: @@ -106,8 +106,8 @@ gcc-5_sanitize_no_opengl_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" image: i386/ubuntu:xenial <<: *job-push variables: @@ -174,7 +174,7 @@ gcc-5_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_tests.sh --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: @@ -189,8 +189,8 @@ gcc-5_tests_i386: gcc-5_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-manaversegame --enable-stldebug image: ubuntu:xenial <<: *job-push variables: @@ -205,7 +205,7 @@ gcc-5_sdl2_tests: gcc-5_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: @@ -220,7 +220,7 @@ gcc-5_sdl2_tests_i386: gcc-5_sdl2_no_opengl_tests: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaversegame image: ubuntu:xenial <<: *job-push variables: @@ -235,7 +235,7 @@ gcc-5_sdl2_no_opengl_tests: gcc-5_sdl2_no_opengl_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc5_sdl2_tests.sh --without-opengl --without-dyecmd --without-manaversegame image: i386/ubuntu:xenial <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml index 298300ff0..2e202b946 100644 --- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml index f26477e95..0d1f5669b 100644 --- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,8 +20,8 @@ gcc-6_sanitize_doctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" image: debian:stretch <<: *job-push variables: @@ -37,7 +37,7 @@ gcc-6_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -53,7 +53,7 @@ gcc-6_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -69,7 +69,7 @@ gcc-6_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -86,7 +86,7 @@ gcc-6_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:stretch variables: @@ -103,7 +103,7 @@ gcc-6_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -119,7 +119,7 @@ gcc-6_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -135,7 +135,7 @@ gcc-6_tests_glibcdebug: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: debian:stretch <<: *job-push variables: @@ -151,7 +151,7 @@ gcc-6_tests_glibcdebug_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: i386/debian:stretch <<: *job-push variables: @@ -166,7 +166,7 @@ gcc-6_tests_glibcdebug_i386: gcc-6_sdl2_tests: stage: build script: - - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: @@ -181,7 +181,7 @@ gcc-6_sdl2_tests: gcc-6_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_sdl2_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:stretch <<: *job-push variables: @@ -197,9 +197,9 @@ gcc-6_tests_valgrind: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: debian:stretch <<: *job-push @@ -216,9 +216,9 @@ gcc-6_tests_valgrind_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: i386/debian:stretch <<: *job-push @@ -235,7 +235,7 @@ gcc-6_tarball_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tarball_tests.sh --without-dyecmd --without-manaversegame image: debian:stretch <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml index 7586df0ae..e5ec598a0 100644 --- a/tools/ci/branches/ci_gcc7/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml index d1be7f727..74376a54c 100644 --- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,8 +20,8 @@ gcc-7_sanitize_doctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" image: debian:buster <<: *job-push variables: @@ -38,7 +38,7 @@ gcc-7_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -55,7 +55,7 @@ gcc-7_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -71,7 +71,7 @@ gcc-7_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -88,7 +88,7 @@ gcc-7_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests_simd.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -105,7 +105,7 @@ gcc-7_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -122,7 +122,7 @@ gcc-7_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:buster variables: @@ -139,7 +139,7 @@ gcc-7_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -155,8 +155,8 @@ gcc-7_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug image: debian:buster <<: *job-push variables: @@ -172,7 +172,7 @@ gcc-7_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -187,7 +187,7 @@ gcc-7_tests: gcc-7_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:buster <<: *job-push variables: @@ -203,9 +203,9 @@ gcc-7_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: debian:buster <<: *job-push @@ -222,9 +222,9 @@ gcc-7_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: i386/debian:buster <<: *job-push @@ -241,7 +241,7 @@ gcc-7_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh image: debian:buster <<: *job-push @@ -256,9 +256,9 @@ gcc-7_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" image: debian:buster <<: *job-push variables: @@ -282,9 +282,9 @@ gcc-7_separate_doctest_sanitize: gcc-7_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" image: debian:buster <<: *job-push variables: @@ -309,7 +309,7 @@ gcc-7_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:buster @@ -325,7 +325,7 @@ gcc-7_separate_doctest_i386: gcc-7_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:buster @@ -342,7 +342,7 @@ gcc-7_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: @@ -358,7 +358,7 @@ gcc-7_unsigned_char_tests: gcc-7_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc7_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: debian:buster <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml index 29aaee53a..c4ab85379 100644 --- a/tools/ci/branches/ci_gcc8/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml index 65c5b8be5..d91f27a84 100644 --- a/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc8_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -21,8 +21,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -39,8 +39,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc8_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -56,7 +56,7 @@ gcc-8_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-8_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -88,7 +88,7 @@ gcc-8_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-8_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-8_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-8_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-8_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-8_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -185,7 +185,7 @@ gcc-8_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -199,7 +199,7 @@ gcc-8_tests: gcc-8_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,9 +215,9 @@ gcc-8_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true <<: *job-push variables: @@ -233,9 +233,9 @@ gcc-8_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: i386/debian:unstable <<: *job-push @@ -252,7 +252,7 @@ gcc-8_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,9 +266,9 @@ gcc-8_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -291,9 +291,9 @@ gcc-8_separate_doctest_sanitize: gcc-8_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -317,7 +317,7 @@ gcc-8_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -333,7 +333,7 @@ gcc-8_separate_doctest_i386: gcc-8_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc8_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -364,7 +364,7 @@ gcc-8_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -380,7 +380,7 @@ gcc-8_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -396,7 +396,7 @@ gcc-8_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -411,7 +411,7 @@ gcc-8_unsigned_char_tests: gcc-8_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml index ff98223ed..1e0f4e672 100644 --- a/tools/ci/branches/ci_gcc9/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] diff --git a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml index 90f668189..585f19201 100644 --- a/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc9_tests/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -21,8 +21,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -39,8 +39,8 @@ stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaplusgame - - ldd ./src/manaplustests | grep "libasan" + - ./tools/ci/jobs/gcc9_sanitize_tests.sh --enable-glibcdebug --enable-unittests=doctest --without-dyecmd --without-manaversegame + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -56,7 +56,7 @@ gcc-9_doctest_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -73,7 +73,7 @@ gcc-9_tests_simd: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -88,7 +88,7 @@ gcc-9_tests_O0: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O0" @@ -104,7 +104,7 @@ gcc-9_tests_O1: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests_simd.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-O1" @@ -120,7 +120,7 @@ gcc-9_tests_lto: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-ffast-math -O9 -flto -fwhole-program -funswitch-loops" @@ -136,7 +136,7 @@ gcc-9_tests_lto_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -153,7 +153,7 @@ gcc-9_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -169,8 +169,8 @@ gcc-9_tests_flags: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -185,7 +185,7 @@ gcc-9_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -199,7 +199,7 @@ gcc-9_tests: gcc-9_sdl2_tests_i386: stage: build script: - - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame image: i386/debian:unstable <<: *job-push variables: @@ -215,9 +215,9 @@ gcc-9_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true <<: *job-push variables: @@ -233,9 +233,9 @@ gcc-9_sdl2_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame || true + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame || true - echo test valgrind - - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log + - valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log - grep "invalid" logs/valg.log && exit 1 || true image: i386/debian:unstable <<: *job-push @@ -252,7 +252,7 @@ gcc-9_separate_doctest: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push variables: @@ -266,9 +266,9 @@ gcc-9_separate_doctest_sanitize: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -293,9 +293,9 @@ gcc-9_separate_doctest_sanitize: gcc-9_separate_doctest_sanitize_sdl2: stage: build script: - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh - - ldd ./src/manaplustests | grep "libasan" + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt" @@ -320,7 +320,7 @@ gcc-9_separate_doctest_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -336,7 +336,7 @@ gcc-9_separate_doctest_i386: gcc-9_separate_doctest_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd --with-sdl2 + - ./tools/ci/jobs/gcc9_silent.sh --enable-unittestsbin=doctest --without-manaversegame --without-dyecmd --with-sdl2 - ./tools/ci/scripts/separateunittests.sh <<: *job-push image: i386/debian:unstable @@ -367,7 +367,7 @@ gcc-9_systemcatch_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemcatch --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -383,7 +383,7 @@ gcc-9_systemdoctest_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --enable-unittests=systemdoctest --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-9 g++-9 @@ -399,7 +399,7 @@ gcc-9_unsigned_char_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" @@ -414,7 +414,7 @@ gcc-9_unsigned_char_tests: gcc-9_sdl2_unsigned_char_tests: stage: build script: - - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc9_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: POST_CXXFLAGS: "-funsigned-char" diff --git a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml index 2ada2b528..46c035678 100644 --- a/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml +++ b/tools/ci/branches/ci_glibcdebug/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,7 +20,7 @@ gcc-8_tests_glibcdebug_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug image: i386/debian:unstable <<: *job-push variables: @@ -95,7 +95,7 @@ clang-7.0_glibcdebug_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/clang70_tests.sh --without-dyecmd --without-manaversegame --enable-glibcdebug <<: *job-push image: debian:buster variables: @@ -110,7 +110,7 @@ clang-7.0_glibcdebug_tests: clang-7.0_glibcdebug_tests_sdl2: stage: build script: - - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame --enable-glibcdebug + - ./tools/ci/jobs/clang70_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame --enable-glibcdebug <<: *job-push image: debian:buster variables: diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml index 27ecc3655..66c25fc0f 100644 --- a/tools/ci/branches/ci_main1/.gitlab-ci.yml +++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -89,7 +89,7 @@ gcc-gentoo_sdl1: script: - ./tools/ci/jobs/any_compiler.sh --enable-werror - ./tools/ci/scripts/runtests.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl1 + image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl1 <<: *job-push variables: LOGFILE: gcc.log @@ -106,7 +106,7 @@ gcc-gentoo_sdl2: script: - ./tools/ci/jobs/any_compiler.sh --with-sdl2 --enable-werror - ./tools/ci/scripts/runtests.sh - image: registry.gitlab.com/manaplus/images:gentoo_gcc_sdl2 + image: registry.gitlab.com/manaverse/images:gentoo_gcc_sdl2 <<: *job-push variables: LOGFILE: gcc.log diff --git a/tools/ci/branches/ci_malloc/.gitlab-ci.yml b/tools/ci/branches/ci_malloc/.gitlab-ci.yml index ace0f93a3..9a88deb46 100644 --- a/tools/ci/branches/ci_malloc/.gitlab-ci.yml +++ b/tools/ci/branches/ci_malloc/.gitlab-ci.yml @@ -19,7 +19,7 @@ gcc-8_tests_jmalloc: script: - ls ${MALLOC} - ./tools/ci/scripts/patchsdl1.sh - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -36,7 +36,7 @@ gcc-8_tests_jmalloc_i386: script: - ls ${MALLOC} - ./tools/ci/scripts/patchsdl1.sh - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -53,7 +53,7 @@ gcc-8_tests_jmalloc_sdl2: stage: build script: - ls ${MALLOC} - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -69,7 +69,7 @@ gcc-8_tests_jmalloc_sdl2_i386: stage: build script: - ls ${MALLOC} - - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaplusgame + - LD_PRELOAD=${MALLOC} ./tools/ci/jobs/gcc8_tests.sh --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -86,7 +86,7 @@ gcc-8_tests_tcmalloc: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -101,7 +101,7 @@ gcc-8_tests_tcmalloc_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: @@ -116,7 +116,7 @@ gcc-8_tests_tcmalloc_i386: gcc-8_tests_tcmalloc_sdl2: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -130,7 +130,7 @@ gcc-8_tests_tcmalloc_sdl2: gcc-8_tests_tcmalloc_sdl2_i386: stage: build script: - - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc8_tests.sh --enable-tcmalloc --with-sdl2 --without-dyecmd --without-manaversegame <<: *job-push image: i386/debian:unstable variables: diff --git a/tools/ci/branches/ci_mse/.gitlab-ci.yml b/tools/ci/branches/ci_mse/.gitlab-ci.yml index d35de9c08..a722d63b1 100644 --- a/tools/ci/branches/ci_mse/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mse/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,7 +20,7 @@ gcc-7_tests_mse_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --enable-stldebug + - ./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --enable-stldebug image: i386/debian:buster <<: *job-push variables: diff --git a/tools/ci/branches/ci_mxe/.gitlab-ci.yml b/tools/ci/branches/ci_mxe/.gitlab-ci.yml index 5e7526c7a..dc10a58fc 100644 --- a/tools/ci/branches/ci_mxe/.gitlab-ci.yml +++ b/tools/ci/branches/ci_mxe/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -15,7 +15,7 @@ stages: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -24,7 +24,7 @@ mxe_gcc6_shared_32_testsbin: stage: build script: - ls /mxe - - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd artifacts: paths: - logs @@ -32,7 +32,7 @@ mxe_gcc6_shared_32_testsbin: when: always expire_in: 1 week dependencies: [] - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32 variables: PACKAGES: bash CROSS: i686-w64-mingw32.shared @@ -43,7 +43,7 @@ mxe_gcc6_shared_64_testsbin: stage: build script: - ls /mxe - - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd artifacts: paths: - logs @@ -51,7 +51,7 @@ mxe_gcc6_shared_64_testsbin: when: always expire_in: 1 week dependencies: [] - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64 variables: PACKAGES: bash CROSS: x86_64-w64-mingw32.shared diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml index a5c5995b3..0a7d04417 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -17,7 +17,7 @@ before_script: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -26,7 +26,7 @@ before_script: artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -35,9 +35,9 @@ gcc-6_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaplusgame + - ./tools/ci/jobs/gcc6_tests_gcov.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -54,8 +54,8 @@ gcc-6_sdl2_tests_gcov: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus - - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaplusgame + - cd manaverse + - ./tools/ci/jobs/gcc6_sdl2_tests_gcov.sh --without-dyecmd --without-manaversegame <<: *job-push variables: PACKAGES: gcc-6 g++-6 @@ -72,12 +72,12 @@ doxygen: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/scripts/patchsdl1.sh - ./tools/ci/jobs/doxygen.sh artifacts: paths: - - manaplus/doxygen + - manaverse/doxygen expire_in: 3 week when: always dependencies: [] @@ -93,11 +93,11 @@ gitstats: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstats.sh artifacts: paths: - - manaplus/stats + - manaverse/stats expire_in: 3 week when: always dependencies: [] @@ -111,12 +111,12 @@ gitstatsh: stage: build script: - ./tools/ci/scripts/clonesrc.sh - - cd manaplus + - cd manaverse - ./tools/ci/jobs/gitstatsh.sh image: debian:buster artifacts: paths: - - manaplus/stats2 + - manaverse/stats2 expire_in: 3 week when: always dependencies: [] @@ -132,10 +132,10 @@ pages: stage: stats script: - rm -rf artifacts || true - - mv manaplus artifacts + - mv manaverse artifacts - ./tools/ci/scripts/clonesrc.sh - - mv artifacts/* manaplus/ - - cd manaplus + - mv artifacts/* manaverse/ + - cd manaverse - ./tools/ci/jobs/pages.sh dependencies: - doxygen diff --git a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml index b1dcf40e6..9d964af60 100644 --- a/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml +++ b/tools/ci/branches/ci_xmllibs/.gitlab-ci.yml @@ -2,7 +2,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -11,7 +11,7 @@ artifacts: paths: - logs - - manaplus/logs + - manaverse/logs when: always expire_in: 3 week dependencies: [] @@ -20,7 +20,7 @@ gcc-8_pugixml_tests: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-libxml=pugixml <<: *job-push variables: PACKAGES: gcc-8 g++-8 @@ -35,7 +35,7 @@ gcc-8_pugixml_tests_i386: stage: build script: - ./tools/ci/scripts/patchsdl1.sh - - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaplusgame --enable-libxml=pugixml + - ./tools/ci/jobs/gcc8_tests.sh --without-dyecmd --without-manaversegame --enable-libxml=pugixml image: i386/debian:unstable <<: *job-push variables: diff --git a/tools/ci/branches/master/.gitlab-ci.yml b/tools/ci/branches/master/.gitlab-ci.yml index 610c4dfda..afa230689 100644 --- a/tools/ci/branches/master/.gitlab-ci.yml +++ b/tools/ci/branches/master/.gitlab-ci.yml @@ -186,7 +186,7 @@ mxe_gcc6_shared_32: - ls /mxe - ./tools/ci/jobs/mxe_gcc6.sh <<: *job-push - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_32 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_32 variables: PACKAGES: bash CROSS: i686-w64-mingw32.shared @@ -199,7 +199,7 @@ mxe_gcc6_shared_64: - ls /mxe - ./tools/ci/jobs/mxe_gcc6.sh <<: *job-push - image: registry.gitlab.com/manaplus/mxe:gcc6_shared_64 + image: registry.gitlab.com/manaverse/mxe:gcc6_shared_64 variables: PACKAGES: bash CROSS: x86_64-w64-mingw32.shared @@ -237,7 +237,7 @@ gcc-10_game_only: gcc-10_dyecmd_only: stage: prebuild script: - - ./tools/ci/jobs/gcc10.sh --without-manaplusgame + - ./tools/ci/jobs/gcc10.sh --without-manaversegame <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -248,7 +248,7 @@ gcc-10_dyecmd_only: gcc-10_unittestsbin: stage: prebuild script: - - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin --without-manaplusgame --without-dyecmd + - ./tools/ci/jobs/gcc10_silent.sh --enable-unittestsbin --without-manaversegame --without-dyecmd <<: *job-push variables: PACKAGES: gcc-10 g++-10 @@ -330,10 +330,10 @@ triggers: - echo /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvz} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5 - /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/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -356,10 +356,10 @@ triggers: script: - ./tools/ci/scripts/downloadlib.sh ${LIBNAME} ${LIBVERSION} - export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libasan.so.5 - - /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/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -383,9 +383,9 @@ triggers: - ./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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -405,9 +405,9 @@ triggers: 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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -430,9 +430,9 @@ triggers: - ./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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --without-manaversegame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -454,9 +454,9 @@ triggers: 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" + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/jobs/gcc10_sanitize_tests.sh --enable-unittests=yes --with-sdl2 --without-manaversegame --without-dyecmd + - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ${runenvx} ${runenvz} ./tools/ci/scripts/checkldd.sh src/manaversetests + - ldd ./src/manaversetests | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -479,7 +479,7 @@ triggers: script: - ./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/checkldd.sh src/manaverse - /usr/local/spm/bin/${LIBNAME}_${LIBVERSION}/runenv.sh ./tools/ci/scripts/runtests.sh <<: *job-push variables: @@ -502,7 +502,7 @@ triggers: - /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" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -524,7 +524,7 @@ triggers: - ./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" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -549,7 +549,7 @@ triggers: - /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" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL @@ -573,7 +573,7 @@ triggers: - ./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" + - ldd ./src/manaverse | grep "libasan" <<: *job-push variables: LIBNAME: SDL diff --git a/tools/ci/jobs/gitstatsh.sh b/tools/ci/jobs/gitstatsh.sh index 376d31f43..e4f6dfbb9 100755 --- a/tools/ci/jobs/gitstatsh.sh +++ b/tools/ci/jobs/gitstatsh.sh @@ -13,7 +13,7 @@ check_error $? git log --stat --no-merges --summary --decorate=false >repo_log check_error $? cd gitstatsh/v1 -python main.py ManaPlus ../../repo_log +python main.py ManaVerse ../../repo_log check_error $? mv web ../../stats2 check_error $? diff --git a/tools/ci/jobs/windowstest.cmd b/tools/ci/jobs/windowstest.cmd index 5fcd9099c..25e298133 100644 --- a/tools/ci/jobs/windowstest.cmd +++ b/tools/ci/jobs/windowstest.cmd @@ -3,6 +3,6 @@ cd test mkdir %1 xcopy /s C:\gitlabrunner\%1 %1 cd %1 -copy ..\..\src\manaplustests.exe .\ +copy ..\..\src\manaversetests.exe .\ dir -manaplustests.exe +manaversetests.exe diff --git a/tools/ci/jobs/xcode.sh b/tools/ci/jobs/xcode.sh index b07148b13..8649c6ba8 100755 --- a/tools/ci/jobs/xcode.sh +++ b/tools/ci/jobs/xcode.sh @@ -8,4 +8,4 @@ cd ../../Xcode || exit 1 ./build.sh || exit 1 ./pack.sh || exit 1 ls -la build || exit 1 -cp build/manaplus.dmg "${artifacts}/" || exit 1 +cp build/manaverse.dmg "${artifacts}/" || exit 1 diff --git a/tools/ci/scripts/azure/mxetest.sh b/tools/ci/scripts/azure/mxetest.sh index 30cf8342e..9dd57db4f 100755 --- a/tools/ci/scripts/azure/mxetest.sh +++ b/tools/ci/scripts/azure/mxetest.sh @@ -6,7 +6,7 @@ echo docker login registry.gitlab.com -u azure -p TOKEN docker login registry.gitlab.com -u azure -p $GITLABTOKEN || exit 1 export IMAGE="registry.gitlab.com/manaplus/mxe:gcc6_shared_${BITS}" -export COMMAND="./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaplusgame --without-dyecmd" +export COMMAND="./tools/ci/jobs/mxe_gcc6_tests.sh --without-manaversegame --without-dyecmd" export PACKAGES="bash" ./tools/ci/scripts/docker_run_cross.sh || exit 1 mkdir dlls || true diff --git a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh index afaae9234..10dbe2351 100755 --- a/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh +++ b/tools/ci/scripts/circleci/gcc6_sanitize_tests.sh @@ -6,7 +6,7 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; @@ -15,7 +15,7 @@ case $CIRCLE_NODE_INDEX in ;; 2) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc6_tests.sh b/tools/ci/scripts/circleci/gcc6_tests.sh index 644f4b75f..bce1cbe49 100755 --- a/tools/ci/scripts/circleci/gcc6_tests.sh +++ b/tools/ci/scripts/circleci/gcc6_tests.sh @@ -6,25 +6,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=i386/debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; 1) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 2) export IMAGE=i386/debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 3) export IMAGE=debian:stretch - export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export COMMAND="./tools/ci/jobs/gcc6_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-6 g++-6 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh index 1b3c9a8fa..e7d243407 100755 --- a/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_sanitize_tests.sh @@ -9,7 +9,7 @@ case $CIRCLE_NODE_INDEX in ;; 1) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; @@ -18,7 +18,7 @@ case $CIRCLE_NODE_INDEX in ;; 3) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaplusgame --without-opengl --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=yes --without-dyecmd --without-manaversegame --without-opengl --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/circleci/gcc7_tests.sh b/tools/ci/scripts/circleci/gcc7_tests.sh index 0acab9a7b..ff3b643d9 100755 --- a/tools/ci/scripts/circleci/gcc7_tests.sh +++ b/tools/ci/scripts/circleci/gcc7_tests.sh @@ -6,25 +6,25 @@ echo "Current node: ${CIRCLE_NODE_INDEX}" case $CIRCLE_NODE_INDEX in 0) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 1) export IMAGE=i386/debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug --with-sdl2" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug --with-sdl2" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL2} valgrind" ./tools/ci/scripts/docker_run.sh ;; 2) export IMAGE=debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl --enable-glibcdebug" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl --enable-glibcdebug" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; 3) export IMAGE=i386/debian:buster - export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaplusgame --without-opengl" + export COMMAND="./tools/ci/jobs/gcc7_tests.sh --without-dyecmd --without-manaversegame --without-opengl" export PACKAGES="gcc-7 g++-7 ${LIBS_PACKAGES} ${SDL1} valgrind" ./tools/ci/scripts/docker_run.sh ;; diff --git a/tools/ci/scripts/clonesrc.sh b/tools/ci/scripts/clonesrc.sh index efb0596d3..60d231c9f 100755 --- a/tools/ci/scripts/clonesrc.sh +++ b/tools/ci/scripts/clonesrc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -rm -rf manaplus || true -./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://gitlab.com/manaplus/manaplus.git manaplus" || exit 1 -mkdir manaplus/logs || exit 1 +rm -rf manaverse || true +./tools/ci/scripts/retry.sh "git clone --branch master --depth ${GIT_DEPTH} https://git.themanaworld.org/mana/plus.git manaverse" || exit 1 +mkdir manaverse/logs || exit 1 diff --git a/tools/ci/scripts/init.sh b/tools/ci/scripts/init.sh index 9512e9b66..41fa63a03 100755 --- a/tools/ci/scripts/init.sh +++ b/tools/ci/scripts/init.sh @@ -164,15 +164,15 @@ function run_make_check { make -j${JOBS} V=0 check $* 2>$ERRFILE export ERR=$? cp src/*.log logs || true - cp src/manaplustests.trs logs || true + cp src/manaversetests.trs logs || true cp src/Makefile logs || true if [ "${ERR}" != 0 ]; then cat $ERRFILE - cat src/manaplustests.log + cat src/manaversetests.log exit ${ERR} fi # disabled due performance issue. it runs bigger than gitlab limit (3h) -# valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaplustests 2>logs/valg.log +# valgrind -q --read-var-info=yes --track-origins=yes --malloc-fill=11 --free-fill=55 --show-reachable=yes --leak-check=full --leak-resolution=high --partial-loads-ok=yes --error-limit=no ./src/manaversetests 2>logs/valg.log # export DATA=$(grep "invalid" logs/valg.log) # if [ "$DATA" != "" ]; # then @@ -230,7 +230,7 @@ function run_tarball { cd $1 echo "tar xf ../*.tar.xz" tar xf ../*.tar.xz - cd manaplus* + cd manaverse* } function run_mplint { diff --git a/tools/ci/scripts/rundyecmd.sh b/tools/ci/scripts/rundyecmd.sh index fc399f822..c6807d91a 100755 --- a/tools/ci/scripts/rundyecmd.sh +++ b/tools/ci/scripts/rundyecmd.sh @@ -2,8 +2,8 @@ function testdye { 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 + echo ./src/dyecmd "data/icons/manaverse.png|$1" test1.png + ./src/dyecmd "data/icons/manaverse.png|$1" test1.png || exit 1 ls test1.png || exit 1 rm test1.png || true } diff --git a/tools/ci/scripts/runtest.sh b/tools/ci/scripts/runtest.sh index 4b0320fed..70468166c 100755 --- a/tools/ci/scripts/runtest.sh +++ b/tools/ci/scripts/runtest.sh @@ -6,19 +6,19 @@ function check_is_run { echo "Error: process look like crashed" cat logs/run.log echo "Run with gdb" - cp ./src/manaplus ./logs/ + cp ./src/manaverse ./logs/ cp -r core* ./logs/ sleep 10 COREFILE=$(find . -maxdepth 1 -name "core*" | head -n 1) if [[ -f "$COREFILE" ]]; then - gdb -c "$COREFILE" ./src/manaplus -ex "thread apply all bt" -ex "set pagination 0" -batch + gdb -c "$COREFILE" ./src/manaverse -ex "thread apply all bt" -ex "set pagination 0" -batch fi exit 1 fi } function check_assert { - grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaplus.log" + grep -A 20 "Assert:" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Assert found in log" exit 1 @@ -31,9 +31,9 @@ function wait_for_servers_list { echo "wait for servers list ${n}" check_is_run # check here - grep "Skipping servers list update" "${HOME}/.local/share/mana/manaplus.log" && return - grep "Servers list updated" "${HOME}/.local/share/mana/manaplus.log" && return - grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaplus.log" + grep "Skipping servers list update" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Servers list updated" "${HOME}/.local/share/mana/manaverse.log" && return + grep "Error: servers list updating error" "${HOME}/.local/share/mana/manaverse.log" if [ "$?" == 0 ]; then echo "Servers list downloading error" exit 1 @@ -50,9 +50,9 @@ function wait_for_servers_list { } function run { - ./src/manaplus --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 & + ./src/manaverse --hide-cursor --enable-ipc --renderer=0 >logs/run.log 2>&1 & export PID=$! - echo "manaplus PID: ${PID}" + echo "manaverse PID: ${PID}" sleep 20 echo "pause after run" wait_for_servers_list @@ -95,16 +95,16 @@ function send_command { } function check_exists { - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then sleep 10 - if [ ! -f "logs/home/Desktop/ManaPlus/$1" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$1" ]; then echo "Error: image $1 not exists" exit 1 fi fi - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then sleep 10 - if [ ! -f "logs/home/Desktop/ManaPlus/$2" ]; then + if [ ! -f "logs/home/Desktop/ManaVerse/$2" ]; then echo "Error: image $2 not exists" exit 1 fi @@ -113,7 +113,7 @@ function check_exists { function imagesdiff { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" == 0 ]; then echo "Error: images '$1' and '$2' is same." exit 1 @@ -122,7 +122,7 @@ function imagesdiff { function imagessame { check_exists "$1" "$2" - diff "logs/home/Desktop/ManaPlus/$1" "logs/home/Desktop/ManaPlus/$2" + diff "logs/home/Desktop/ManaVerse/$1" "logs/home/Desktop/ManaVerse/$2" if [ "$?" != 0 ]; then echo "Error: images '$1' and '$2' is different." exit 1 @@ -233,7 +233,7 @@ imagesdiff new_server.png about.png send_command "/sendmousekey 500 20 1" send_command "/screenshot about.png" -# open about manaplus page +# open about manaverse page send_command "/sendmousekey 300 ${ABOUTYOFFSET} 1" send_command "/screenshot about2.png" imagesdiff about.png about2.png diff --git a/tools/ci/scripts/runtests.sh b/tools/ci/scripts/runtests.sh index 9f0a6729f..a7c7985a7 100755 --- a/tools/ci/scripts/runtests.sh +++ b/tools/ci/scripts/runtests.sh @@ -26,8 +26,8 @@ while true; do 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" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.log" ./tools/ci/scripts/runtest.sh if [ "$?" != 0 ]; then exit 1 @@ -45,8 +45,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" + rm "${HOME}/.local/share/mana/manaverse.log" + rm "/root/.local/share/mana/manaverse.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..01d05d634 100755 --- a/tools/ci/scripts/separateunittests.sh +++ b/tools/ci/scripts/separateunittests.sh @@ -15,7 +15,7 @@ do declare -a "arr=($str)" 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 + echo ./src/manaversetests --test-case=\"${arr[0]}\" --subcase=\"${arr[1]}\" + ./src/manaversetests --test-case="${arr[0]}" --subcase="${arr[1]}" || exit 1 done diff --git a/tools/doxygen/doxygen.conf b/tools/doxygen/doxygen.conf index 76ca1ea11..fcf2b170b 100644 --- a/tools/doxygen/doxygen.conf +++ b/tools/doxygen/doxygen.conf @@ -4,10 +4,10 @@ c# Doxyfile 1.8.8 # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = "ManaPlus" +PROJECT_NAME = "ManaVerse" PROJECT_NUMBER = PROJECT_BRIEF = -PROJECT_LOGO = data/icons/manaplus.png +PROJECT_LOGO = data/icons/manaverse.png OUTPUT_DIRECTORY = doxygen CREATE_SUBDIRS = NO ALLOW_UNICODE_NAMES = NO |