diff options
author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2018-10-02 16:35:54 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 16:35:54 -0500 |
commit | 7531725d2bf2e6df84a9a8ea406a3d8c45a5e29a (patch) | |
tree | 0e686ba7f9a7d745bc86c71c8629ee21510bb728 | |
parent | 302cd4e5424a5c0248ce8481eb75c932d52da191 (diff) | |
parent | a580349bbb39fa9681ab2e2d05dd448f8b082399 (diff) |
Merge branch 'master' into fixPPregfixPPreg
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | INSTALL.md | 2 | ||||
-rw-r--r-- | test/CMakeLists.txt | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e850f9928..435407fea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -196,6 +196,9 @@ endif() # Never build unit tests as static binaries, otherwise we'll end up with # ~300MB per unit test. if(ENABLE_UNIT_TESTING) + if(NOT ENABLE_SHARED) + message(WARNING "Disabling static build since unit testing is enabled.") + endif() set(ENABLE_SHARED ON) endif() diff --git a/INSTALL.md b/INSTALL.md index 2f0c7a051..9e0c9dfc4 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -306,7 +306,7 @@ All custom test targets build and run a preconfigured set of tests. Build and run all unit tests. - `make regress [-jN] [ARGS=-jN]` - Build and run all regression tests. + Build and run regression tests from levels 0 and 1. - `make runexamples [-jN] [ARGS=-jN]` Build and run all examples. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f601e5247..b2f138572 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,6 +5,9 @@ # > system tests add_custom_target(build-tests) +# Since examples are also built and run for testing, we have to add examples +# to the build test dependencies. +add_dependencies(build-tests examples) # Note: Do not add custom targets for running tests (regress, systemtests, # units) as dependencies to other run targets. This will result in executing |