summaryrefslogtreecommitdiff
path: root/tools/ci/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'tools/ci/scripts')
-rwxr-xr-xtools/ci/scripts/azure/mxetest.sh2
-rwxr-xr-xtools/ci/scripts/circleci/gcc6_sanitize_tests.sh4
-rwxr-xr-xtools/ci/scripts/circleci/gcc6_tests.sh8
-rwxr-xr-xtools/ci/scripts/circleci/gcc7_sanitize_tests.sh4
-rwxr-xr-xtools/ci/scripts/circleci/gcc7_tests.sh8
-rwxr-xr-xtools/ci/scripts/clonesrc.sh6
-rwxr-xr-xtools/ci/scripts/init.sh2
-rwxr-xr-xtools/ci/scripts/rundyecmd.sh4
-rwxr-xr-xtools/ci/scripts/runtest.sh30
-rwxr-xr-xtools/ci/scripts/runtests.sh16
10 files changed, 42 insertions, 42 deletions
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..7e4350ae5 100755
--- a/tools/ci/scripts/init.sh
+++ b/tools/ci/scripts/init.sh
@@ -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 e629fc514..523bd4b41 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/manaverse/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/manaverse/manaverse.log" && return
+ grep "Servers list updated" "${HOME}/.local/share/manaverse/manaverse.log" && return
+ grep "Error: servers list updating error" "${HOME}/.local/share/manaverse/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 15
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 7
- 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 7
- 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 1263521f9..cf781ff1b 100755
--- a/tools/ci/scripts/runtests.sh
+++ b/tools/ci/scripts/runtests.sh
@@ -22,12 +22,12 @@ echo "clean config runs"
n=0
while true; do
echo "run test ${n}"
- rm "${HOME}/.config/mana/mana/config.xml"
- rm "/root/.config/mana/mana/config.xml"
- rm "${HOME}/.config/mana/mana/serverlistplus.xml"
- rm "/root/.config/mana/mana/serverlistplus.xml"
- rm "${HOME}/.local/share/mana/manaplus.log"
- rm "/root/.local/share/mana/manaplus.log"
+ rm "${HOME}/.config/mana/manaverse/config.xml"
+ rm "/root/.config/mana/manaverse/config.xml"
+ rm "${HOME}/.config/mana/manaverse/serverlistplus.xml"
+ rm "/root/.config/mana/manaverse/serverlistplus.xml"
+ rm "${HOME}/.local/share/manaverse/manaverse.log"
+ rm "/root/.local/share/manaverse/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/manaverse/manaverse.log"
+ rm "/root/.local/share/manaverse/manaverse.log"
./tools/ci/scripts/runtest.sh
if [ "$?" != 0 ]; then
exit 1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-21 14:12:39 +0000