From a0c16f94fc3c327ac94c002bef16c0023e7f575c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Tue, 16 Mar 2021 15:30:29 +0000 Subject: Replace Unix shell commands with scripts. --- test cases/common/151 reserved targets/runtarget/echo.py | 6 ++++++ test cases/common/151 reserved targets/runtarget/meson.build | 2 +- .../common/84 identical target name in subproject/meson.build | 6 ++++-- .../subprojects/foo/meson.build | 6 ++++-- .../84 identical target name in subproject/subprojects/foo/true.py | 4 ++++ test cases/common/84 identical target name in subproject/true.py | 4 ++++ 6 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 test cases/common/151 reserved targets/runtarget/echo.py create mode 100644 test cases/common/84 identical target name in subproject/subprojects/foo/true.py create mode 100644 test cases/common/84 identical target name in subproject/true.py diff --git a/test cases/common/151 reserved targets/runtarget/echo.py b/test cases/common/151 reserved targets/runtarget/echo.py new file mode 100644 index 0000000..7f9f179 --- /dev/null +++ b/test cases/common/151 reserved targets/runtarget/echo.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 + +import sys + +if len(sys.argv) > 1: + print(sys.argv[1]) diff --git a/test cases/common/151 reserved targets/runtarget/meson.build b/test cases/common/151 reserved targets/runtarget/meson.build index 52c371b..7ba0b8c 100644 --- a/test cases/common/151 reserved targets/runtarget/meson.build +++ b/test cases/common/151 reserved targets/runtarget/meson.build @@ -1,2 +1,2 @@ configure_file(output : 'config.h', configuration: configuration_data()) -run_target('runtarget', command : ['echo']) +run_target('runtarget', command : [find_program('echo.py')]) diff --git a/test cases/common/84 identical target name in subproject/meson.build b/test cases/common/84 identical target name in subproject/meson.build index c5be5b7..64b4363 100644 --- a/test cases/common/84 identical target name in subproject/meson.build +++ b/test cases/common/84 identical target name in subproject/meson.build @@ -2,6 +2,8 @@ project('toplevel bar', 'c') subproject('foo') +true_cmd = find_program('true.py') + executable('bar', 'bar.c') -run_target('nop', command : ['true']) -custom_target('cus', output: ['cus.c'], command : ['true']) +run_target('nop', command : [true_cmd]) +custom_target('cus', output: ['cus.c'], command : [true_cmd]) diff --git a/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build index 06addb4..94b235c 100644 --- a/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build +++ b/test cases/common/84 identical target name in subproject/subprojects/foo/meson.build @@ -1,5 +1,7 @@ project('subfoo', 'c') +true_cmd = find_program('true.py') + executable('bar', 'bar.c') -run_target('nop', command : ['true']) -custom_target('cus', output: ['cus.c'], command : ['true']) +run_target('nop', command : [true_cmd]) +custom_target('cus', output: ['cus.c'], command : [true_cmd]) diff --git a/test cases/common/84 identical target name in subproject/subprojects/foo/true.py b/test cases/common/84 identical target name in subproject/subprojects/foo/true.py new file mode 100644 index 0000000..ddcac9e --- /dev/null +++ b/test cases/common/84 identical target name in subproject/subprojects/foo/true.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +if __name__ == '__main__': + pass diff --git a/test cases/common/84 identical target name in subproject/true.py b/test cases/common/84 identical target name in subproject/true.py new file mode 100644 index 0000000..ddcac9e --- /dev/null +++ b/test cases/common/84 identical target name in subproject/true.py @@ -0,0 +1,4 @@ +#!/usr/bin/env python3 + +if __name__ == '__main__': + pass -- cgit v1.1