From 3e6ea8eeb0fb6cc72c2d4aaaf20e5633847e3737 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 12 Nov 2018 00:48:25 +0300 Subject: Test dyecmd in some ci jobs. --- tools/ci/branches/ci_clang3x/.gitlab-ci.yml | 1 + tools/ci/branches/ci_gcc3/.gitlab-ci.yml | 2 ++ tools/ci/branches/ci_gcc4x/.gitlab-ci.yml | 17 +++++++++++++++++ tools/ci/scripts/rundyecmd.sh | 14 ++++++++++++++ 4 files changed, 34 insertions(+) create mode 100755 tools/ci/scripts/rundyecmd.sh (limited to 'tools') diff --git a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml index 3c7b805bd..da743ef54 100644 --- a/tools/ci/branches/ci_clang3x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_clang3x/.gitlab-ci.yml @@ -281,6 +281,7 @@ clang-3.9_sdl2: script: - ./tools/ci/jobs/clang39_sdl2.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh <<: *job-push variables: PACKAGES: gcc g++ clang-3.9 libc++-dev libc++abi-dev diff --git a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml index 4c3d14b2b..82b58be9b 100644 --- a/tools/ci/branches/ci_gcc3/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc3/.gitlab-ci.yml @@ -21,6 +21,7 @@ gcc-3_sdl1: script: - ./tools/ci/jobs/gcc3.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc3_sdl1 <<: *job-push variables: @@ -34,6 +35,7 @@ gcc-3_sdl2: script: - ./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 <<: *job-push variables: diff --git a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml index 3eb36c7db..84998670f 100644 --- a/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml +++ b/tools/ci/branches/ci_gcc4x/.gitlab-ci.yml @@ -19,6 +19,7 @@ gcc-4.4: script: - ./tools/ci/jobs/gcc44.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: debian:wheezy <<: *job-push variables: @@ -35,6 +36,7 @@ gcc-4.1_sdl1: script: - ./tools/ci/jobs/gcc41.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc41_sdl1 <<: *job-push variables: @@ -50,6 +52,7 @@ gcc-4.1_sdl2: script: - ./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 <<: *job-push variables: @@ -65,6 +68,7 @@ gcc-4.3_sdl1: script: - ./tools/ci/jobs/gcc43.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: registry.gitlab.com/manaplus/images:gentoo_gcc43_sdl1 <<: *job-push variables: @@ -80,6 +84,7 @@ gcc-4.3_sdl2: script: - ./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 <<: *job-push variables: @@ -95,6 +100,7 @@ gcc-4.4_i386: script: - ./tools/ci/jobs/gcc44.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: vicamo/debian:wheezy-i386 <<: *job-push variables: @@ -111,6 +117,7 @@ gcc-4.5: script: - ./tools/ci/jobs/gcc45.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: ubuntu:12.04 <<: *job-push variables: @@ -127,6 +134,7 @@ gcc-4.6: script: - ./tools/ci/jobs/gcc46.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: debian:wheezy <<: *job-push variables: @@ -143,6 +151,7 @@ gcc-4.6_i386: script: - ./tools/ci/jobs/gcc46.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: vicamo/debian:wheezy-i386 <<: *job-push variables: @@ -159,8 +168,10 @@ gcc-4.7: script: - ./tools/ci/jobs/gcc47.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh - ./tools/ci/jobs/gcc47_c++11.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: debian:wheezy <<: *job-push variables: @@ -177,6 +188,7 @@ gcc-4.7_i386: script: - ./tools/ci/jobs/gcc47.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: vicamo/debian:wheezy-i386 <<: *job-push variables: @@ -193,8 +205,10 @@ gcc-4.8: script: - ./tools/ci/jobs/gcc48.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh - ./tools/ci/jobs/gcc48_c++11.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: debian:jessie <<: *job-push variables: @@ -209,6 +223,7 @@ gcc-4.8_i386: script: - ./tools/ci/jobs/gcc48.sh - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: vicamo/debian:jessie-i386 <<: *job-push variables: @@ -225,6 +240,7 @@ gcc-4.8_sdl2: script: - ./tools/ci/jobs/gcc48.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: debian:jessie <<: *job-push variables: @@ -239,6 +255,7 @@ gcc-4.8_sdl2_i386: script: - ./tools/ci/jobs/gcc48.sh --with-sdl2 - ./tools/ci/scripts/runtests.sh + - ./tools/ci/scripts/rundyecmd.sh image: vicamo/debian:jessie-i386 <<: *job-push variables: diff --git a/tools/ci/scripts/rundyecmd.sh b/tools/ci/scripts/rundyecmd.sh new file mode 100755 index 000000000..57a229768 --- /dev/null +++ b/tools/ci/scripts/rundyecmd.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +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 + ls test1.png || exit 1 + rm test1.png || true +} + +export SDL_VIDEODRIVER="dummy" +testdye "S:#3c3c3c,40332d,4d4d4d,5e4a3d,686868,705740,919191,a1825d,b6b6b6,b59767,dfdfdf,dbbf88" +testdye "A:#3c3c3c00,40332d50" +testdye "W:#743e66,955372,bd6f8c,e68e9a,f0b49c,efe1c7" -- cgit v1.2.3-70-g09d2