diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-29 18:23:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-29 18:23:23 +0300 |
| commit | 6e794c380ba2febe67f563c3388797b8b4482f82 (patch) | |
| tree | eacb4e6f629d7292d9e22825be10f915b3f9ca10 /docs/markdown | |
| parent | 1cf7f40e8542acf3b65ec18e1414edb65113fe42 (diff) | |
| parent | eefc7d450c7839db63df2d8a6e4bcc991205a058 (diff) | |
| download | meson-6e794c380ba2febe67f563c3388797b8b4482f82.zip meson-6e794c380ba2febe67f563c3388797b8b4482f82.tar.gz meson-6e794c380ba2febe67f563c3388797b8b4482f82.tar.bz2 | |
Merge pull request #6911 from mensinda/ciBionic
ci: Add Ubuntu Bionic image
Diffstat (limited to 'docs/markdown')
| -rw-r--r-- | docs/markdown/Contributing.md | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index 5332938..8a24e0b 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -174,7 +174,7 @@ contents of an additional file into the CI log on failure. Projects needed by unit tests are in the `test cases/unit` subdirectory. They are not run as part of `./run_project_tests.py`. -#### Configuring project tests +### Configuring project tests The (optional) `test.json` file, in the root of a test case, is used for configuring the test. All of the following root entries in the `test.json` @@ -209,17 +209,20 @@ Exanple `test.json`: { "opt1": "qwert", "opt2": "false" }, { "opt1": "bad" } ] + }, + "tools": { + "cmake": ">=3.11" } } ``` -##### env +#### env The `env` key contains a dictionary which specifies additional environment variables to be set during the configure step of the test. `@ROOT@` is replaced with the absolute path of the source directory. -##### installed +#### installed The `installed` dict contains a list of dicts, describing which files are expected to be installed. Each dict contains the following keys: @@ -277,7 +280,7 @@ the platform matches. The following values for `platform` are currently supporte | `cygwin` | Matches when the platform is cygwin | | `!cygwin` | Not `cygwin` | -##### matrix +#### matrix The `matrix` section can be used to define a test matrix to run project tests with different meson options. @@ -318,12 +321,19 @@ The above example will produce the following matrix entries: - `opt1=qwert` - `opt1=qwert opt2=true` -##### do_not_set_opts +#### do_not_set_opts Currently supported values are: - `prefix` - `libdir` +#### tools + +This section specifies a list of tool requirements in a simple key-value format. +If a tool is specified, it has to be present in the environment, and the version +requirement must be fulfilled match. Otherwise, the entire test is skipped +(including every element in the test matrix). + ### Skipping integration tests Meson uses several continuous integration testing systems that have slightly |