diff options
author | MarcoFalke <falke.marco@gmail.com> | 2020-06-29 08:58:26 -0400 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2020-07-02 12:22:39 -0400 |
commit | fa8e6df282af0d396d75b03721f1b59a520ced19 (patch) | |
tree | eb2cf1e76734f8f5a525df94068e450c45c05b70 | |
parent | 7027c67cac852b27c6d71489e4135fabdd624226 (diff) |
ci: Run tsan ci config on cirrus
-rw-r--r-- | .cirrus.yml | 16 | ||||
-rw-r--r-- | .travis.yml | 5 |
2 files changed, 14 insertions, 7 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9c2598d606..446d3e35a9 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,4 +1,5 @@ -# Global defaults +### Global defaults + timeout_in: 120m # https://cirrus-ci.org/faq/#instance-timed-out container: # https://cirrus-ci.org/faq/#are-there-any-limits @@ -12,7 +13,9 @@ env: TEST_RUNNER_PORT_MIN: "14000" # Must be larger than 12321, which is used for the http cache. See https://cirrus-ci.org/guide/writing-tasks/#http-cache CCACHE_SIZE: "200M" CCACHE_DIR: "/tmp/ccache_dir" -# Global task template + +### Global task template + # https://cirrus-ci.org/guide/tips-and-tricks/#sharing-configuration-between-tasks global_task_template: &GLOBAL_TASK_TEMPLATE ccache_cache: @@ -31,6 +34,7 @@ global_task_template: &GLOBAL_TASK_TEMPLATE - git merge FETCH_HEAD # Merge base to detect silent merge conflicts ci_script: - ./ci/test_run_all.sh + #task: # name: "Windows" # windows_container: @@ -48,6 +52,14 @@ global_task_template: &GLOBAL_TASK_TEMPLATE # - choco install python --version=3.7.7 -y task: + name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:focal + env: + FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" + +task: name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]' << : *GLOBAL_TASK_TEMPLATE container: diff --git a/.travis.yml b/.travis.yml index 9184257d47..783737c8c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,11 +100,6 @@ jobs: FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" - stage: test - name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_tsan.sh" - - - stage: test name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]' env: >- FILE_ENV="./ci/test/00_setup_env_native_msan.sh" |