summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2016-08-25 10:44:49 +0200
committerVegard Sjonfjell <vegardsjo@gmail.com>2016-08-25 10:44:49 +0200
commit12d75332fc473c45136df4b067a3e2ca4397c97f (patch)
treef5f429b8aab2413d84b1981611362d1469334b0c
parentce6cbcb589fbf5a690a40fd9bb50aeeecf984ba8 (diff)
Fix typos and clearify error message. (#454)
* Fix typos and clearify error message. * Fix new typo
-rw-r--r--build_settings.cmake4
-rw-r--r--functions.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/build_settings.cmake b/build_settings.cmake
index 76871e9dd5f..020056ce354 100644
--- a/build_settings.cmake
+++ b/build_settings.cmake
@@ -11,10 +11,10 @@ set(EXCLUDE_TESTS_FROM_ALL FALSE CACHE BOOL "If TRUE, do not build tests as part
set(VALGRIND_UNIT_TESTS FALSE CACHE BOOL "If TRUE, run unit tests via valgrind")
# Whether to run tests marked as benchmark as part of the test runs
-set(RUN_BENCHMARKS FALSE CACHE BOOL "If TRUE, benchmars are run togheter with the other tests")
+set(RUN_BENCHMARKS FALSE CACHE BOOL "If TRUE, benchmarks are run together with the other tests")
# Whether to run tests marked as benchmark as part of the test runs
-set(AUTORUN_UNIT_TESTS FALSE CACHE BOOL "If TRUE, tests will be run immediately after linking the test")
+set(AUTORUN_UNIT_TESTS FALSE CACHE BOOL "If TRUE, tests will be run immediately after linking the test executable")
# Warnings
set(WARN_OPTS "-Wuninitialized -Werror -Wall -W -Wchar-subscripts -Wcomment -Wformat -Wparentheses -Wreturn-type -Wswitch -Wtrigraphs -Wunused -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings")
diff --git a/functions.cmake b/functions.cmake
index 69cc455de65..5cbeabae706 100644
--- a/functions.cmake
+++ b/functions.cmake
@@ -369,7 +369,7 @@ function(vespa_add_test)
list(LENGTH TEST_DEPENDENCIES TEST_DEPENDENCIES_LENGTH)
if(${TEST_DEPENDENCIES_LENGTH} EQUAL 0)
- message(FATAL_ERROR "Test does not have any dependencies. This is not allowed.")
+ message(FATAL_ERROR "Test does not have any dependencies. It's not allowed if the command is neither a target nor a script.")
endif()
if(VALGRIND_UNIT_TESTS AND NOT ARG_NO_VALGRIND)