From 125aa8bcb72156a2c371466d328333800ab3f66c Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 6 May 2020 18:21:58 +0200 Subject: [PATCH] CONAN_RUN_TESTS usage updated --- .travis.yml | 2 +- appveyor.yml.disabled | 2 +- docs/usage.rst | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b93ccf1f..4d29b6c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ env: global: - - CONAN_RUN_TESTS: 1 + - mp-units:CONAN_RUN_TESTS: 1 - CONAN_DOCKER_32_IMAGES: 1 linux: &linux diff --git a/appveyor.yml.disabled b/appveyor.yml.disabled index 20a063a7..b57102bb 100644 --- a/appveyor.yml.disabled +++ b/appveyor.yml.disabled @@ -1,7 +1,7 @@ build: false environment: - CONAN_RUN_TESTS: 1 + mp-units:CONAN_RUN_TESTS: 1 PYTHON: "C:\\Python37" matrix: diff --git a/docs/usage.rst b/docs/usage.rst index 54e2c12c..55102a66 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -199,14 +199,14 @@ Full **mp-units** Build, Unit Testing, and Documentation Generation In case you would like to build all the source code (with unit tests and examples) and documentation in **mp-units** repository, you should use the *CMakeLists.txt* from the top-level directory, -obtain Python dependencies, and run Conan with :envvar:`CONAN_RUN_TESTS` = ``True``: +obtain Python dependencies, and run Conan with :envvar:`mp-units:CONAN_RUN_TESTS` = ``True``: .. code-block:: shell git clone --recurse-submodules https://github.com/mpusz/units.git && cd units pip3 install -r docs/requirements.txt mkdir build && cd build - conan install .. -pr -s compiler.cppstd=20 -e CONAN_RUN_TESTS=True -b outdated + conan install .. -pr -s compiler.cppstd=20 -e mp-units:CONAN_RUN_TESTS=True -b outdated cmake .. -DCMAKE_BUILD_TYPE=Release cmake --build . ctest @@ -224,7 +224,7 @@ To test CMake installation and Conan packaging or create a Conan package run: git clone --recurse-submodules https://github.com/mpusz/units.git && cd units pip3 install -r docs/requirements.txt - conan create . / -pr -s compiler.cppstd=20 -e CONAN_RUN_TESTS=True -b outdated + conan create . / -pr -s compiler.cppstd=20 -e mp-units:CONAN_RUN_TESTS=True -b outdated The above will create a Conan package and run tests provided in *./test_package* directory.