diff options
author | iphydf <iphydf@users.noreply.github.com> | 2020-04-20 12:25:18 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2020-05-03 14:03:54 +0100 |
commit | 7b758f66dbc550fa52ed66fd7f8b81f8ed37a94e (patch) | |
tree | 62c555aab13c7703f343806d37b81d2ccd4eb2c7 | |
parent | f8ab32aaa4efce2c9a310a14d10b19fb8544cfd9 (diff) |
Enable cimple tests by default but allow disabling them.
Use `bazel test //c-toxcore/... --build_tag_filters=-haskell` to run all
tests except the ones that depend on Haskell (i.e. cimple tests).
-rw-r--r-- | .cirrus.yml | 13 | ||||
-rw-r--r-- | toxav/BUILD.bazel | 2 | ||||
-rw-r--r-- | toxcore/BUILD.bazel | 3 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index ab863125..65d6554f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml | |||
@@ -1,15 +1,16 @@ | |||
1 | --- | 1 | --- |
2 | cirrus-ci_task: | 2 | cirrus-ci_task: |
3 | container: | 3 | container: |
4 | image: toxchat/toktok-stack:0.0.7 | 4 | image: toxchat/toktok-stack:0.0.10 |
5 | cpu: 2 | 5 | cpu: 2 |
6 | memory: 2G | 6 | memory: 2G |
7 | configure_script: | 7 | configure_script: |
8 | - /src/workspace/tools/inject-repo c-toxcore | 8 | - /src/workspace/tools/inject-repo c-toxcore |
9 | test_all_script: | 9 | test_all_script: |
10 | - bazel test -k | 10 | - bazel test -k |
11 | --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST | 11 | --build_tag_filters=-haskell |
12 | --config=ci | 12 | --test_tag_filters=-haskell |
13 | --config=docker | 13 | --remote_download_minimal |
14 | --config=release | 14 | --config=ci |
15 | //c-toxcore/... | 15 | --config=release |
16 | //c-toxcore/... | ||
diff --git a/toxav/BUILD.bazel b/toxav/BUILD.bazel index 036bde3f..d7e6b6e9 100644 --- a/toxav/BUILD.bazel +++ b/toxav/BUILD.bazel | |||
@@ -139,5 +139,5 @@ sh_test( | |||
139 | srcs = ["//hs-tokstyle/tools:check-cimple"], | 139 | srcs = ["//hs-tokstyle/tools:check-cimple"], |
140 | args = ["$(location %s)" % f for f in CIMPLE_SRCS], | 140 | args = ["$(location %s)" % f for f in CIMPLE_SRCS], |
141 | data = CIMPLE_SRCS, | 141 | data = CIMPLE_SRCS, |
142 | tags = ["manual"], | 142 | tags = ["haskell"], |
143 | ) | 143 | ) |
diff --git a/toxcore/BUILD.bazel b/toxcore/BUILD.bazel index af23a2b2..0fdfe0ae 100644 --- a/toxcore/BUILD.bazel +++ b/toxcore/BUILD.bazel | |||
@@ -33,6 +33,7 @@ cc_test( | |||
33 | name = "crypto_core_test", | 33 | name = "crypto_core_test", |
34 | size = "small", | 34 | size = "small", |
35 | srcs = ["crypto_core_test.cc"], | 35 | srcs = ["crypto_core_test.cc"], |
36 | flaky = True, | ||
36 | deps = [ | 37 | deps = [ |
37 | ":crypto_core", | 38 | ":crypto_core", |
38 | "@com_google_googletest//:gtest_main", | 39 | "@com_google_googletest//:gtest_main", |
@@ -296,5 +297,5 @@ sh_test( | |||
296 | srcs = ["//hs-tokstyle/tools:check-cimple"], | 297 | srcs = ["//hs-tokstyle/tools:check-cimple"], |
297 | args = ["$(location %s)" % f for f in CIMPLE_SRCS], | 298 | args = ["$(location %s)" % f for f in CIMPLE_SRCS], |
298 | data = CIMPLE_SRCS, | 299 | data = CIMPLE_SRCS, |
299 | tags = ["manual"], | 300 | tags = ["haskell"], |
300 | ) | 301 | ) |