summaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-03-05 15:43:46 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-03-05 15:43:46 +0200
commit52b69b8939c7b16e344c3756292ab803abbeae6b (patch)
tree7138ff8a903255bb8ab2f2d14c25d0ac8fff2b60 /test cases
parentec491e200ba82f6f6d0df2f10ae4a607efeb3657 (diff)
downloadmeson-52b69b8939c7b16e344c3756292ab803abbeae6b.tar.gz
Make sure that build and source subdirectories are always in search
path.
Diffstat (limited to 'test cases')
-rw-r--r--test cases/common/16 configure file/meson.build5
-rw-r--r--test cases/common/35 sizeof/meson.build2
-rw-r--r--test cases/common/36 define10/meson.build2
-rw-r--r--test cases/common/61 custom target source output/meson.build4
-rw-r--r--test cases/common/64 custom header generator/meson.build3
-rw-r--r--test cases/common/65 multiple generators/meson.build2
-rw-r--r--test cases/common/72 build always/meson.build3
7 files changed, 8 insertions, 13 deletions
diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/16 configure file/meson.build
index f381c8ec8..911a50ffa 100644
--- a/test cases/common/16 configure file/meson.build
+++ b/test cases/common/16 configure file/meson.build
@@ -11,7 +11,7 @@ configure_file(input : 'config.h.in',
output : 'config.h',
configuration : conf)
-e = executable('inctest', 'prog.c', include_directories : include_directories('.'))
+e = executable('inctest', 'prog.c')
test('inctest', e)
# Now generate a header file with an external script.
@@ -25,5 +25,4 @@ output : 'config2.h',
command : [genprog, scriptfile, ifile, ofile],
install_dir : 'share/appdir')
-test('inctest2', executable('prog2', 'prog2.c',
-include_directories : include_directories('.')))
+test('inctest2', executable('prog2', 'prog2.c'))
diff --git a/test cases/common/35 sizeof/meson.build b/test cases/common/35 sizeof/meson.build
index 520ed3f1b..4a0398ba2 100644
--- a/test cases/common/35 sizeof/meson.build
+++ b/test cases/common/35 sizeof/meson.build
@@ -9,5 +9,5 @@ cd.set('INTSIZE', intsize)
cd.set('WCHARSIZE', wcharsize)
configure_file(input : 'config.h.in', output : 'config.h', configuration : cd)
-e = executable('prog', 'prog.c', include_directories : include_directories('.'))
+e = executable('prog', 'prog.c')
test('sizeof test', e)
diff --git a/test cases/common/36 define10/meson.build b/test cases/common/36 define10/meson.build
index f56a00a7a..a28e7e48d 100644
--- a/test cases/common/36 define10/meson.build
+++ b/test cases/common/36 define10/meson.build
@@ -8,5 +8,5 @@ configure_file(input : 'config.h.in',
output : 'config.h',
configuration : conf)
-exe = executable('prog', 'prog.c', include_directories : include_directories('.'))
+exe = executable('prog', 'prog.c')
test('10test', exe)
diff --git a/test cases/common/61 custom target source output/meson.build b/test cases/common/61 custom target source output/meson.build
index 16252447b..ae65055a8 100644
--- a/test cases/common/61 custom target source output/meson.build
+++ b/test cases/common/61 custom target source output/meson.build
@@ -5,7 +5,5 @@ output : ['mylib.h', 'mylib.c'],
command : [find_program('generator.py'), meson.current_build_dir()],
)
-e = executable('prog', 'main.c', ct,
-include_directories : include_directories('.')
-)
+e = executable('prog', 'main.c', ct)
test('gentest', e)
diff --git a/test cases/common/64 custom header generator/meson.build b/test cases/common/64 custom header generator/meson.build
index 3360f2329..b4224012c 100644
--- a/test cases/common/64 custom header generator/meson.build
+++ b/test cases/common/64 custom header generator/meson.build
@@ -7,6 +7,5 @@ output : 'myheader.lh', # Suffix not .h to ensure this works with custom suffixe
input : 'input.def',
command : [gen, '@INPUT0@', '@OUTPUT0@'])
-prog = executable('prog', 'prog.c', generated_h,
-include_directories : include_directories('.'))
+prog = executable('prog', 'prog.c', generated_h)
test('gentest', prog)
diff --git a/test cases/common/65 multiple generators/meson.build b/test cases/common/65 multiple generators/meson.build
index 969610be3..b6fd03892 100644
--- a/test cases/common/65 multiple generators/meson.build
+++ b/test cases/common/65 multiple generators/meson.build
@@ -9,5 +9,5 @@ input : 'data2.dat',
command : [comp, '@INPUT0@', meson.current_build_dir()])
exe = executable('prog', 'main.cpp', generated, generated2,
-include_directories : include_directories('subdir', '.'))
+include_directories : include_directories('subdir'))
test('generated test', exe)
diff --git a/test cases/common/72 build always/meson.build b/test cases/common/72 build always/meson.build
index 7cb2e4b0a..f720c8943 100644
--- a/test cases/common/72 build always/meson.build
+++ b/test cases/common/72 build always/meson.build
@@ -11,5 +11,4 @@ command : [vgen, '@INPUT@', '@OUTPUT@', version],
build_always : true,
)
-executable('versionprinter', 'main.c', version_src,
-include_directories : include_directories('.'))
+executable('versionprinter', 'main.c', version_src)