diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-02-23 16:56:27 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2022-02-28 09:03:27 -0500 |
| commit | 6acfe48f32110671a0adf80ad3497a35105b265d (patch) | |
| tree | 5fd822233653e9670e2aea820b59be1932aa2075 /test cases | |
| parent | ac4f8d0088e7be5fc37f4611a7fadb2361c945f2 (diff) | |
| download | meson-6acfe48f32110671a0adf80ad3497a35105b265d.zip meson-6acfe48f32110671a0adf80ad3497a35105b265d.tar.gz meson-6acfe48f32110671a0adf80ad3497a35105b265d.tar.bz2 | |
Allow setting method/separator in environment() and meson.add_devenv()
Diffstat (limited to 'test cases')
| -rw-r--r-- | test cases/unit/91 devenv/meson.build | 5 | ||||
| -rwxr-xr-x | test cases/unit/91 devenv/test-devenv.py | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test cases/unit/91 devenv/meson.build b/test cases/unit/91 devenv/meson.build index 90c4cee..f5c24d8 100644 --- a/test cases/unit/91 devenv/meson.build +++ b/test cases/unit/91 devenv/meson.build @@ -11,6 +11,11 @@ env = environment() env.append('TEST_B', ['2', '3'], separator: '+') meson.add_devenv(env) +meson.add_devenv({'TEST_B': '0'}, separator: '+', method: 'prepend') + +env = environment({'TEST_B': ['4']}, separator: '+', method: 'append') +meson.add_devenv(env) + # This exe links on a library built in another directory. On Windows this means # PATH must contain builddir/subprojects/sub to be able to run it. executable('app', 'main.c', dependencies: foo_dep, install: true) diff --git a/test cases/unit/91 devenv/test-devenv.py b/test cases/unit/91 devenv/test-devenv.py index de7eec2..8273805 100755 --- a/test cases/unit/91 devenv/test-devenv.py +++ b/test cases/unit/91 devenv/test-devenv.py @@ -6,7 +6,7 @@ from pathlib import Path assert os.environ['MESON_DEVENV'] == '1' assert os.environ['MESON_PROJECT_NAME'] == 'devenv' assert os.environ['TEST_A'] == '1' -assert os.environ['TEST_B'] == '1+2+3' +assert os.environ['TEST_B'] == '0+1+2+3+4' from mymod.mod import hello assert hello == 'world' |