diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 23:16:42 +0300 |
| commit | e6a868e533724aeeb0e8450d511f30c7f8f22f6d (patch) | |
| tree | 9a60a3442c2cb2bfba9ef36e632602e12249e44f /test cases/common | |
| parent | 24d23c3086afe687cc93b26a07f504902f4a0b02 (diff) | |
| parent | 78739afd9c75fd0b7265536c41922abe7be7a8e4 (diff) | |
| download | meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.zip meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.gz meson-e6a868e533724aeeb0e8450d511f30c7f8f22f6d.tar.bz2 | |
Merge pull request #229 from mesonbuild/crossname
Use system() instead of name() which is a confusing term.
Diffstat (limited to 'test cases/common')
| -rw-r--r-- | test cases/common/31 find program/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/38 run program/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/55 file grabber/meson.build | 2 | ||||
| -rw-r--r-- | test cases/common/59 object generator/meson.build | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/test cases/common/31 find program/meson.build b/test cases/common/31 find program/meson.build index cc3bba7..ae71703 100644 --- a/test cases/common/31 find program/meson.build +++ b/test cases/common/31 find program/meson.build @@ -1,6 +1,6 @@ project('find program', 'c') -if build_machine.name() == 'windows' +if build_machine.system() == 'windows' # Things Windows does not provide: # - an executable to copy files without prompting # - working command line quoting diff --git a/test cases/common/38 run program/meson.build b/test cases/common/38 run program/meson.build index f0bc9ce..20a8107 100644 --- a/test cases/common/38 run program/meson.build +++ b/test cases/common/38 run program/meson.build @@ -1,6 +1,6 @@ project('run command', 'c') -if build_machine.name() == 'windows' +if build_machine.system() == 'windows' c = run_command('cmd', '/c', 'echo', 'hello') else c = run_command('echo', 'hello') @@ -24,7 +24,7 @@ endif # Now the same with a script. -if build_machine.name() == 'windows' +if build_machine.system() == 'windows' cs = run_command('scripts/hello.bat') else cs = run_command('scripts/hello.sh') diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/55 file grabber/meson.build index d9ee2d3..e332c0b 100644 --- a/test cases/common/55 file grabber/meson.build +++ b/test cases/common/55 file grabber/meson.build @@ -9,7 +9,7 @@ project('grabber', 'c') # acceptable to you, then we're certainly not going to stop you. Just don't # file bugs when it fails. :) -if build_machine.name() == 'windows' +if build_machine.system() == 'windows' c = run_command('grabber.bat') grabber = find_program('grabber2.bat') else diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/59 object generator/meson.build index ffdc1b9..761ef77 100644 --- a/test cases/common/59 object generator/meson.build +++ b/test cases/common/59 object generator/meson.build @@ -6,7 +6,7 @@ python = find_program('python3') # Code will not be rebuilt if it changes. comp = '@0@/@1@'.format(meson.current_source_dir(), 'obj_generator.py') -if host_machine.name() == 'windows' +if host_machine.system() == 'windows' outputname = '@BASENAME@.obj' else outputname = '@BASENAME@.o' |