diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2022-04-23 18:12:44 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2022-04-23 23:56:31 +0300 |
| commit | 9f9c7905bf64278ca7fc6f582b3799aebd252da6 (patch) | |
| tree | b944cbc2eeea400096e457bbb38ba135b4b3afd3 | |
| parent | a2079939de2d1d271e5ea7f23c3656a73e325728 (diff) | |
| download | meson-9f9c7905bf64278ca7fc6f582b3799aebd252da6.zip meson-9f9c7905bf64278ca7fc6f582b3799aebd252da6.tar.gz meson-9f9c7905bf64278ca7fc6f582b3799aebd252da6.tar.bz2 | |
Do not use 'echo' as it is not available on plain cmd.exe
4 files changed, 10 insertions, 4 deletions
diff --git a/test cases/failing/115 run_target in test/meson.build b/test cases/failing/115 run_target in test/meson.build index db7cb30..1d448ec 100644 --- a/test cases/failing/115 run_target in test/meson.build +++ b/test cases/failing/115 run_target in test/meson.build @@ -1,4 +1,7 @@ project('trivial test', 'c') + +py_inst = import('python').find_installation() + exe = executable('trivialprog', 'trivial.c') -runt = run_target('invalid', command: ['echo', 'run_target']) +runt = run_target('invalid', command: [py_inst, '--version']) test('runtest', exe, args: runt) diff --git a/test cases/failing/115 run_target in test/test.json b/test cases/failing/115 run_target in test/test.json index fce0c47..6eddb7c 100644 --- a/test cases/failing/115 run_target in test/test.json +++ b/test cases/failing/115 run_target in test/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/115 run_target in test/meson.build:4:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]" + "line": "test cases/failing/115 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]" } ] } diff --git a/test cases/failing/116 run_target in add_install_script/meson.build b/test cases/failing/116 run_target in add_install_script/meson.build index 9d37a39..f8ae3a1 100644 --- a/test cases/failing/116 run_target in add_install_script/meson.build +++ b/test cases/failing/116 run_target in add_install_script/meson.build @@ -1,4 +1,7 @@ project('trivial test', 'c') + +py_inst = import('python').find_installation() + exe = executable('trivialprog', 'trivial.c') -runt = run_target('invalid', command: ['echo', 'run_target']) +runt = run_target('invalid', command: [py_inst, '--version']) meson.add_install_script(exe, runt) diff --git a/test cases/failing/116 run_target in add_install_script/test.json b/test cases/failing/116 run_target in add_install_script/test.json index 621d510..03027e4 100644 --- a/test cases/failing/116 run_target in add_install_script/test.json +++ b/test cases/failing/116 run_target in add_install_script/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/116 run_target in add_install_script/meson.build:4:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\"" + "line": "test cases/failing/116 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\"" } ] } |