From daa3cb06ec786ad85a5ab2a8f892b4fa8381fdfc Mon Sep 17 00:00:00 2001 From: Alastair Robertson Date: Wed, 5 Apr 2023 07:12:27 -0700 Subject: [PATCH] Build with tests by default --- .circleci/config.yml | 2 +- CMakeLists.txt | 4 ++-- website/docs/getting-started.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2b3e694..160d272 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,7 +115,7 @@ jobs: - run: name: Build command: | - cmake -G Ninja -B build/ -DWITH_TESTS=On -DCODE_COVERAGE=On + cmake -G Ninja -B build/ -DWITH_FLAKY_TESTS=Off -DCODE_COVERAGE=On cmake --build build/ # Testing rubbish: cp test/ci.oid.toml build/testing.oid.toml diff --git a/CMakeLists.txt b/CMakeLists.txt index 4074db1..e73b5a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,8 @@ include(cmake/CompilerWarnings.cmake) option(STATIC_LINK "Statically link oid" OFF) option(ASAN "Enable address sanitizer" OFF) option(CODE_COVERAGE "Enable code coverage" OFF) -option(WITH_TESTS "Build with tests" Off) -option(WITH_FLAKY_TESTS "Build with flaky tests" OFF) +option(WITH_TESTS "Build with tests" On) +option(WITH_FLAKY_TESTS "Build with flaky tests" On) option(FORCE_BOOST_STATIC "Build with static boost" On) option(FORCE_LLVM_STATIC "Build with static llvm and clang" On) diff --git a/website/docs/getting-started.md b/website/docs/getting-started.md index f8fba48..abcbe61 100644 --- a/website/docs/getting-started.md +++ b/website/docs/getting-started.md @@ -14,7 +14,7 @@ First ensure your system has all the dependencies installed. We have tested on U $ sudo apt-get update $ sudo apt-get install -y bison autopoint build-essential clang-12 cmake flex gawk libboost-all-dev libbz2-dev libcap2-bin libclang-12-dev libcurl4-gnutls-dev libdouble-conversion-dev libdw-dev libfmt-dev libgflags-dev libgmock-dev libgoogle-glog-dev libgtest-dev libjemalloc-dev libmsgpack-dev libzstd-dev llvm-12-dev ninja-build pkg-config python3-setuptools sudo xsltproc libboost-all-dev $ sudo pip3 install toml -$ cmake -G Ninja -B build/ -DWITH_TESTS=On +$ cmake -G Ninja -B build/ ``` ### OpenSuse Tumbleweed