exclude broken ci jobs.

5 files changed, 22 insertions, 31 deletions

diff --git a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
index 2882c47b4..33140a10a 100644
--- a/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc5/.gitlab-ci.yml
@@ -28,6 +28,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -36,6 +37,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -86,7 +88,8 @@ gcc-5_sanitize_tests:
   tags:
     - docker
 
-gcc-5_sanitize_tests_i386:
+# configure test look like crashed
+.gcc-5_sanitize_tests_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-dyecmd --without-manaplusgame
@@ -117,7 +120,8 @@ gcc-5_sanitize_no_opengl_tests:
   tags:
     - docker
 
-gcc-5_sanitize_no_opengltests_i386:
+# configure test look like crashed
+.gcc-5_sanitize_no_opengltests_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc5_sanitize_tests.sh --without-opengl --without-dyecmd --without-manaplusgame
@@ -148,7 +152,8 @@ gcc-5_sanitize:
   tags:
     - docker
 
-gcc-5_sanitize_i386:
+# configure test look like crashed
+.gcc-5_sanitize_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc5_sanitize.sh
diff --git a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
index 32596ea27..8824ebfa4 100644
--- a/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6/.gitlab-ci.yml
@@ -28,6 +28,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -36,6 +37,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -128,7 +130,8 @@ gcc-6_sanitize:
   tags:
     - docker
 
-gcc-6_sanitize_i386:
+# configure test look like crashed
+.gcc-6_sanitize_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc6_sanitize.sh
diff --git a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
index 95730d6b1..6e1ddfd10 100644
--- a/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc6_tests/.gitlab-ci.yml
@@ -28,6 +28,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -36,6 +37,7 @@ variables:
   artifacts:
     paths:
     - logs
+    - manaplus/logs
     when: always
     expire_in: 3 week
   dependencies: []
@@ -55,10 +57,10 @@ gcc-6_sanitize_doctest_tests:
   tags:
     - docker
 
-gcc-6_sanitize_doctest_tests_i386:
+gcc-6_doctest_tests_i386:
   stage: build
   script:
-  - ./tools/ci/jobs/gcc6_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
+  - ./tools/ci/jobs/gcc6_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   - ldd ./src/manaplustests | grep "libasan"
   image: vicamo/debian:sid-i386
   <<: *job-push
diff --git a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
index 646e777df..7bf696fa6 100644
--- a/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_gcc7_tests/.gitlab-ci.yml
@@ -58,11 +58,10 @@ gcc-7_sanitize_doctest_tests:
   tags:
     - docker
 
-gcc-7_sanitize_doctest_tests_i386:
+gcc-7_doctest_tests_i386:
   stage: build
   script:
-  - ./tools/ci/jobs/gcc7_sanitize_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
-  - ldd ./src/manaplustests | grep "libasan"
+  - ./tools/ci/jobs/gcc7_tests.sh --enable-unittests=doctest --without-dyecmd --without-manaplusgame
   image: vicamo/debian:sid-i386
   <<: *job-push
   variables:
@@ -291,23 +290,14 @@ gcc-7_separate_doctest_sanitize_sdl2:
   tags:
     - docker
 
-gcc-7_separate_doctest_sanitize_i386:
+gcc-7_separate_doctest_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_silent.sh --enable-unittestsbin=doctest --without-manaplusgame --without-dyecmd
   - ./tools/ci/scripts/separateunittests.sh
-  - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
   image: vicamo/debian:sid-i386
   variables:
-    LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt"
-    POST_CXXFLAGS: "-fsanitize=address -fsanitize=undefined
-                    -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable
-                    -fsanitize=vla-bound -fsanitize=null -fsanitize=return
-                    -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment
-                    -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
-                    -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool
-                    -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict"
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
               libxml2-dev libcurl4-gnutls-dev libpng-dev 
@@ -316,23 +306,14 @@ gcc-7_separate_doctest_sanitize_i386:
   tags:
     - docker
 
-gcc-7_separate_doctest_sanitize_sdl2_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/scripts/separateunittests.sh
-  - ldd ./src/manaplustests | grep "libasan"
   <<: *job-push
   image: vicamo/debian:sid-i386
   variables:
-    LSAN_OPTIONS: "suppressions=./tools/ci/scripts/lsansuppression_tests.txt"
-    POST_CXXFLAGS: "-fsanitize=address -fsanitize=undefined
-                    -fsanitize=shift -fsanitize=integer-divide-by-zero -fsanitize=unreachable
-                    -fsanitize=vla-bound -fsanitize=null -fsanitize=return
-                    -fsanitize=signed-integer-overflow -fsanitize=bounds -fsanitize=alignment
-                    -fsanitize=object-size -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow
-                    -fsanitize=nonnull-attribute -fsanitize=returns-nonnull-attribute -fsanitize=bool
-                    -fsanitize=enum -fsanitize=vptr -fsanitize=bounds-strict"
     PACKAGES: gcc-7 g++-7 
               make autoconf automake autopoint gettext 
               libxml2-dev libcurl4-gnutls-dev libpng-dev 
diff --git a/tools/ci/branches/ci_main1/.gitlab-ci.yml b/tools/ci/branches/ci_main1/.gitlab-ci.yml
index 4c8bfec4a..cf79ba9f9 100644
--- a/tools/ci/branches/ci_main1/.gitlab-ci.yml
+++ b/tools/ci/branches/ci_main1/.gitlab-ci.yml
@@ -42,8 +42,8 @@ variables:
     expire_in: 3 week
   dependencies: []
 
-# too slow for one thread, with two threads rundom out of memory issue
-gcc-7_sanitize_i386:
+# crash in config tests
+.gcc-7_sanitize_i386:
   stage: build
   script:
   - ./tools/ci/jobs/gcc7_sanitize.sh