diff options
| -rwxr-xr-x | run_project_tests.py | 10 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/meson.build | 7 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/test.json | 5 | ||||
| -rw-r--r-- | test cases/cmake/5 object library/meson.build | 7 | ||||
| -rw-r--r-- | test cases/cmake/5 object library/test.json | 7 |
5 files changed, 17 insertions, 19 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 088241b..0879e2d 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -669,11 +669,6 @@ def gather_tests(testdir: Path, stdout_mandatory: bool) -> T.List[TestDef]: assert "val" in i skip = False - # Add an empty matrix entry - if i['val'] is None: - tmp_opts += [(None, False)] - continue - # Skip the matrix entry if environment variable is present if 'skip_on_env' in i: for skip_env_var in i['skip_on_env']: @@ -687,6 +682,11 @@ def gather_tests(testdir: Path, stdout_mandatory: bool) -> T.List[TestDef]: skip = True break + # Add an empty matrix entry + if i['val'] is None: + tmp_opts += [(None, skip)] + continue + tmp_opts += [('{}={}'.format(key, i['val']), skip)] if opt_list: diff --git a/test cases/cmake/2 advanced/meson.build b/test cases/cmake/2 advanced/meson.build index 4ebcd48..a10db1c 100644 --- a/test cases/cmake/2 advanced/meson.build +++ b/test cases/cmake/2 advanced/meson.build @@ -5,13 +5,6 @@ if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif -py3 = import('python').find_installation('python3') -get_envvar = '''import os, sys; print(os.environ.get('@0@', 0), end='')''' -# Remove this env var from azure-pipelines.yml when fixed -if run_command(py3, '-c', get_envvar.format('CI_JOB_VS2017')).stdout() == '1' - error('MESON_SKIP_TEST: broken for vs2017 jobs') -endif - cm = import('cmake') # Test the "normal" subproject call diff --git a/test cases/cmake/2 advanced/test.json b/test cases/cmake/2 advanced/test.json index e12f530..f4cb58b 100644 --- a/test cases/cmake/2 advanced/test.json +++ b/test cases/cmake/2 advanced/test.json @@ -1,4 +1,9 @@ { + "matrix": { + "options": { + "_": [{"val": null, "skip_on_env": ["CI_JOB_VS2017"]}] + } + }, "installed": [ {"type": "expr", "file": "usr/?lib/libcm_cmModLib?so"}, {"type": "implib", "platform": "cygwin", "file": "usr/lib/libcm_cmModLib"}, diff --git a/test cases/cmake/5 object library/meson.build b/test cases/cmake/5 object library/meson.build index 40b909b..f38a2dd 100644 --- a/test cases/cmake/5 object library/meson.build +++ b/test cases/cmake/5 object library/meson.build @@ -5,13 +5,6 @@ if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif -py3 = import('python').find_installation('python3') -get_envvar = '''import os, sys; print(os.environ.get('@0@', 0), end='')''' -# Remove this env var from azure-pipelines.yml when fixed -if run_command(py3, '-c', get_envvar.format('CI_JOB_VS2017')).stdout() == '1' - error('MESON_SKIP_TEST: broken for vs2017 jobs') -endif - cm = import('cmake') sub_pro = cm.subproject('cmObjLib') diff --git a/test cases/cmake/5 object library/test.json b/test cases/cmake/5 object library/test.json new file mode 100644 index 0000000..1840ce4 --- /dev/null +++ b/test cases/cmake/5 object library/test.json @@ -0,0 +1,7 @@ +{ + "matrix": { + "options": { + "_": [{"val": null, "skip_on_env": ["CI_JOB_VS2017"]}] + } + } +} |