diff options
| author | Brad King <brad.king@kitware.com> | 2022-08-19 11:20:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-08-19 11:20:18 (GMT) |
| commit | fbef4c6ced4b0b547859fda9447b5ed9bae5e9f1 (patch) | |
| tree | cae48d432aeb2adf861115f800426ce672b1e30e /Tests/RunCMake/FileAPI/ClientStateful-check.py | |
| parent | 31d45782f02254c7780e974a5af1600ae3a1b50c (diff) | |
| parent | b55152e7ad4bb379ae0b8c139f2ceb3e5751e928 (diff) | |
| download | CMake-fbef4c6ced4b0b547859fda9447b5ed9bae5e9f1.zip CMake-fbef4c6ced4b0b547859fda9447b5ed9bae5e9f1.tar.gz CMake-fbef4c6ced4b0b547859fda9447b5ed9bae5e9f1.tar.bz2 | |
Merge topic 'ci-linux-extdeps'
b55152e7ad gitlab-ci: add jobs to test CMake with external dependencies on Linux
6a05d107ca ci: add CMake external build dependencies to Debian and Fedora base images
d3c1b8a491 jsoncpp: Require version 1.6.0 when using system-provided library
68d3ca7008 Tests: Fix RunCMake.FileAPI test with jsoncpp < 1.7.5
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7592
Diffstat (limited to 'Tests/RunCMake/FileAPI/ClientStateful-check.py')
| -rw-r--r-- | Tests/RunCMake/FileAPI/ClientStateful-check.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Tests/RunCMake/FileAPI/ClientStateful-check.py b/Tests/RunCMake/FileAPI/ClientStateful-check.py index f3d20d1..28679bb 100644 --- a/Tests/RunCMake/FileAPI/ClientStateful-check.py +++ b/Tests/RunCMake/FileAPI/ClientStateful-check.py @@ -108,7 +108,11 @@ def check_query_json_empty(q): check_error_re(q, "value, object or array expected") def check_query_json_extra(q): - check_error_re(q, "Extra non-whitespace after JSON value") + if bool(os.environ.get("CMake_JSONCPP_PRE_1_7_5", "")) and is_dict(q) and sorted(q.keys()) == ["responses"]: + # jsoncpp < 1.7.5 did not diagnose extra non-whitespace characters + check_error(q["responses"], "'requests' member missing") + else: + check_error_re(q, "Extra non-whitespace after JSON value") def check_query_not_file(q): check_error_re(q, "failed to read from file") |