aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Reference-manual.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-05-06 23:57:44 +0300
committerGitHub <noreply@github.com>2020-05-06 23:57:44 +0300
commit4ea7c6ee123b3a86a40d0b67c25562aa2405524a (patch)
tree23ed1fd2f6ee6e2be297147f504770a3d3247aa8 /docs/markdown/Reference-manual.md
parentec8db6a1b53072a08674bf2b4301dee7ab3dd589 (diff)
parentdbe00dfe95e9630bd733a45f32076bab6ff80226 (diff)
downloadmeson-4ea7c6ee123b3a86a40d0b67c25562aa2405524a.zip
meson-4ea7c6ee123b3a86a40d0b67c25562aa2405524a.tar.gz
meson-4ea7c6ee123b3a86a40d0b67c25562aa2405524a.tar.bz2
Merge pull request #7064 from dcbaker/gtest-protocol
Add support for Gtest as a test protocol
Diffstat (limited to 'docs/markdown/Reference-manual.md')
-rw-r--r--docs/markdown/Reference-manual.md13
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md
index fd3408c..97d3e83 100644
--- a/docs/markdown/Reference-manual.md
+++ b/docs/markdown/Reference-manual.md
@@ -1666,11 +1666,14 @@ test(..., env: nomalloc, ...)
before test is executed even if they have `build_by_default : false`.
Since 0.46.0
-- `protocol` specifies how the test results are parsed and can be one
- of `exitcode` (the executable's exit code is used by the test harness
- to record the outcome of the test) or `tap` ([Test Anything
- Protocol](https://www.testanything.org/)). For more on the Meson test
- harness protocol read [Unit Tests](Unit-tests.md). Since 0.50.0
+- `protocol` *(Since 0.50.0)* specifies how the test results are parsed and can
+ be one of `exitcode`, `tap`, or `gtest`. For more information about test
+ harness protocol read [Unit Tests](Unit-tests.md). The following values are
+ accepted:
+ - `exitcode`: the executable's exit code is used by the test harness
+ to record the outcome of the test)
+ - `tap` ([Test Anything Protocol](https://www.testanything.org/))
+ - `gtest`. *(Since 0.55.0)* for Google Tests.
- `priority` specifies the priority of a test. Tests with a
higher priority are *started* before tests with a lower priority.