diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2014-05-02 18:52:52 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2014-05-02 18:52:52 +0300 |
| commit | eeaa5d06840345e869d9f87ffa6988a88e49c8f5 (patch) | |
| tree | 5321b0da44a861e17180f65f3f7f3bb685b69265 | |
| parent | f34be394b00da7cce28374cdfa1c3092be2ef82b (diff) | |
| download | meson-eeaa5d06840345e869d9f87ffa6988a88e49c8f5.zip meson-eeaa5d06840345e869d9f87ffa6988a88e49c8f5.tar.gz meson-eeaa5d06840345e869d9f87ffa6988a88e49c8f5.tar.bz2 | |
Some windows fixes.
| -rw-r--r-- | test cases/common/16 configure file/meson.build | 5 | ||||
| -rw-r--r-- | test cases/common/55 file grabber/grabber2.bat | 5 | ||||
| -rw-r--r-- | test cases/common/55 file grabber/meson.build | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build index 281e0b3..33af220 100644 --- a/test cases/common/16 configure file/meson.build +++ b/test cases/common/16 configure file/meson.build @@ -15,13 +15,14 @@ e = executable('inctest', 'prog.c', include_dirs : include_directories('.')) test('inctest', e) # Now generate a header file with an external script. -genprog = find_program('generator.py') +genprog = find_program('python3') +scriptfile = '@0@/generator.py'.format(meson.current_source_dir()) ifile = '@0@/dummy.dat'.format(meson.current_source_dir()) ofile = '@0@/config2.h'.format(meson.current_build_dir()) configure_file(input : 'dummy.dat', output : 'config2.h', -command : [genprog, ifile, ofile]) +command : [genprog, scriptfile, ifile, ofile]) test('inctest2', executable('prog2', 'prog2.c', include_dirs : include_directories('.'))) diff --git a/test cases/common/55 file grabber/grabber2.bat b/test cases/common/55 file grabber/grabber2.bat new file mode 100644 index 0000000..d1a3f98 --- /dev/null +++ b/test cases/common/55 file grabber/grabber2.bat @@ -0,0 +1,5 @@ +@ECHO OFF +echo suba.c +echo subb.c +echo subc.c +echo subprog.c diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/55 file grabber/meson.build index c32af07..f5c5b3c 100644 --- a/test cases/common/55 file grabber/meson.build +++ b/test cases/common/55 file grabber/meson.build @@ -11,7 +11,7 @@ project('grabber', 'c') if build.name() == 'windows' c = run_command('grabber.bat') - grabber = find_program('grabber.bat') + grabber = find_program('grabber2.bat') else c = run_command('grabber.sh') grabber = find_program('grabber.sh') |