Test dyecmd in some ci jobs.

5 files changed, 42 insertions, 0 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 832246882..600d6793d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,6 +80,7 @@ gcc-7-i386:
   script:
   - ./tools/ci/jobs/gcc7.sh
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   image: vicamo/debian:sid-i386
   <<: *job-push
   variables:
@@ -96,6 +97,7 @@ clang-3.9:
   script:
   - ./tools/ci/jobs/clang39.sh
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     PACKAGES: clang-3.9 libc++-dev libc++abi-dev 
@@ -109,6 +111,7 @@ gcc-6:
   script:
   - ./tools/ci/jobs/gcc6.sh
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     PACKAGES: gcc-6 g++-6 
@@ -122,6 +125,7 @@ gcc-8:
   script:
   - ./tools/ci/jobs/gcc8.sh
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     PACKAGES: gcc-8 g++-8 
@@ -135,6 +139,7 @@ gcc-6_default:
   script:
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     LOGFILE: gcc6.log
@@ -152,6 +157,7 @@ gcc-7_default:
   script:
   - ./tools/ci/jobs/any_compiler.sh --enable-werror
   - ./tools/ci/scripts/runtests.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     LOGFILE: gcc6.log
@@ -194,6 +200,7 @@ gcc-5_sdl2:
   stage: prebuild
   script:
   - ./tools/ci/jobs/gcc5_sdl2.sh
+  - ./tools/ci/scripts/rundyecmd.sh
   - ./tools/ci/scripts/runtests.sh
   - ./tools/ci/jobs/gcc5_sdl2_c++11.sh
   - ./tools/ci/scripts/runtests.sh
@@ -222,6 +229,7 @@ gcc-7_dyecmd_only:
   stage: prebuild
   script:
   - ./tools/ci/jobs/gcc7.sh --without-manaplusgame
+  - ./tools/ci/scripts/rundyecmd.sh
   <<: *job-push
   variables:
     PACKAGES: gcc-7 g++-7 
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"