From 7b758f66dbc550fa52ed66fd7f8b81f8ed37a94e Mon Sep 17 00:00:00 2001 From: iphydf Date: Mon, 20 Apr 2020 12:25:18 +0000 Subject: 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). --- .cirrus.yml | 13 +++++++------ toxav/BUILD.bazel | 2 +- 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 @@ --- cirrus-ci_task: container: - image: toxchat/toktok-stack:0.0.7 + image: toxchat/toktok-stack:0.0.10 cpu: 2 memory: 2G configure_script: - /src/workspace/tools/inject-repo c-toxcore test_all_script: - bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST - --config=ci - --config=docker - --config=release - //c-toxcore/... + --build_tag_filters=-haskell + --test_tag_filters=-haskell + --remote_download_minimal + --config=ci + --config=release + //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( srcs = ["//hs-tokstyle/tools:check-cimple"], args = ["$(location %s)" % f for f in CIMPLE_SRCS], data = CIMPLE_SRCS, - tags = ["manual"], + tags = ["haskell"], ) 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( name = "crypto_core_test", size = "small", srcs = ["crypto_core_test.cc"], + flaky = True, deps = [ ":crypto_core", "@com_google_googletest//:gtest_main", @@ -296,5 +297,5 @@ sh_test( srcs = ["//hs-tokstyle/tools:check-cimple"], args = ["$(location %s)" % f for f in CIMPLE_SRCS], data = CIMPLE_SRCS, - tags = ["manual"], + tags = ["haskell"], ) -- cgit v1.2.3