editorconfig: add setting to trim trailing whitespace

and clean up all outstanding issues

Skip 'test cases/common/141 special characters/meson.build' since it
intentionally uses trailing newlines.
pull/9107/head
Eli Schwartz 4 years ago
parent c2592bc921
commit 59d4f771d2
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
  1. 1
      .editorconfig
  2. 1
      cross/iphone.txt
  3. 1
      cross/tvos.txt
  4. 1
      cross/wasm.txt
  5. 1
      data/shell-completions/zsh/_meson
  6. 1
      docs/markdown/Release-notes-for-0.57.0.md
  7. 1
      docs/markdown/Release-notes-for-0.58.0.md
  8. 1
      docs/markdown/Release-notes-for-0.59.0.md
  9. 1
      manual tests/4 standalone binaries/readme.txt
  10. 1
      mesonbuild/coredata.py
  11. 1
      mesonbuild/templates/objcpptemplates.py
  12. 1
      packaging/createpkg.py
  13. 1
      test cases/common/107 spaces backslash/asm output/meson.build
  14. 1
      test cases/common/113 interpreter copy mutable var on assignment/meson.build
  15. 1
      test cases/common/114 skip/meson.build
  16. 1
      test cases/common/115 subproject project arguments/exe.cpp
  17. 1
      test cases/common/13 pch/c/prog.c
  18. 1
      test cases/common/13 pch/generated/prog.c
  19. 1
      test cases/common/13 pch/withIncludeDirectories/prog.c
  20. 1
      test cases/common/13 pch/withIncludeFile/prog.c
  21. 2
      test cases/common/141 special characters/.editorconfig
  22. 1
      test cases/common/147 simd/meson.build
  23. 1
      test cases/common/147 simd/simd_sse2.c
  24. 1
      test cases/common/149 dotinclude/meson.build
  25. 1
      test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/a.c
  26. 1
      test cases/common/176 subproject version/meson.build
  27. 1
      test cases/common/177 subdir_done/meson.build
  28. 1
      test cases/common/230 external project/app.c
  29. 1
      test cases/common/230 external project/func.c
  30. 1
      test cases/common/33 run program/check-env.py
  31. 1
      test cases/common/46 subproject subproject/subprojects/a/a.c
  32. 1
      test cases/common/66 vcstag/meson.build
  33. 1
      test cases/common/66 vcstag/tagprog.c
  34. 1
      test cases/common/66 vcstag/vcstag.c.in
  35. 1
      test cases/common/74 file object/meson.build
  36. 1
      test cases/common/79 same basename/lib.c
  37. 1
      test cases/common/9 header install/meson.build
  38. 1
      test cases/common/9 header install/sub/meson.build
  39. 1
      test cases/cuda/1 simple/meson.build
  40. 1
      test cases/cuda/1 simple/prog.cu
  41. 1
      test cases/cuda/13 cuda compiler setting/meson.build
  42. 2
      test cases/cuda/13 cuda compiler setting/nativefile.ini
  43. 1
      test cases/cuda/13 cuda compiler setting/prog.cu
  44. 1
      test cases/cuda/14 cuda has header symbol/meson.build
  45. 1
      test cases/cuda/15 sanitizer/prog.cu
  46. 1
      test cases/cuda/2 split/lib.cu
  47. 1
      test cases/cuda/2 split/meson.build
  48. 1
      test cases/cuda/2 split/static/lib.cu
  49. 1
      test cases/cuda/2 split/static/libsta.cu
  50. 1
      test cases/cuda/3 cudamodule/meson.build
  51. 1
      test cases/cuda/3 cudamodule/prog.cu
  52. 1
      test cases/cuda/4 shared/shared/kernels.cu
  53. 1
      test cases/cuda/5 threads/shared/kernels.cu
  54. 1
      test cases/d/3 shared library/sub/meson.build
  55. 1
      test cases/failing build/3 pch disabled/c/prog.c
  56. 1
      test cases/failing/106 feature require/meson_options.txt
  57. 1
      test cases/failing/26 output subdir/subdir/dummy.txt
  58. 1
      test cases/failing/40 kwarg assign/meson.build
  59. 1
      test cases/failing/44 abs subdir/meson.build
  60. 1
      test cases/failing/52 slashname/meson.build
  61. 1
      test cases/failing/52 slashname/sub/meson.build
  62. 1
      test cases/failing/73 int literal leading zero/meson.build
  63. 3
      test cases/fortran/11 compiles links runs/meson.build
  64. 1
      test cases/fortran/12 submodule/child.f90
  65. 1
      test cases/fortran/2 modules/prog.f90
  66. 1
      test cases/fpga/1 simple/meson.build
  67. 1
      test cases/frameworks/1 boost/partial_dep/main.cpp
  68. 1
      test cases/frameworks/10 gtk-doc/doc/foobar1/foobar-sections.txt
  69. 1
      test cases/frameworks/14 doxygen/doc/meson.build
  70. 1
      test cases/frameworks/14 doxygen/meson.build
  71. 1
      test cases/frameworks/23 hotdoc/doc/sitemap.txt
  72. 1
      test cases/frameworks/23 hotdoc/meson.build
  73. 1
      test cases/frameworks/4 qt/manualinclude.cpp
  74. 1
      test cases/frameworks/6 gettext/data/data3/test.desktop.in
  75. 1
      test cases/frameworks/6 gettext/data/test.desktop.in
  76. 1
      test cases/frameworks/6 gettext/data/test2.desktop.in
  77. 1
      test cases/frameworks/6 gettext/data/test5.desktop.in.in
  78. 1
      test cases/frameworks/6 gettext/data/test6.desktop.in.in
  79. 1
      test cases/frameworks/6 gettext/data2/test.desktop.in
  80. 1
      test cases/frameworks/6 gettext/po/LINGUAS
  81. 1
      test cases/frameworks/8 flex/testfile
  82. 1
      test cases/java/3 args/meson.build
  83. 1
      test cases/keyval/2 subdir/dir/meson.build
  84. 1
      test cases/keyval/3 load_config files/dir/meson.build
  85. 1
      test cases/objc/2 nsstring/stringprog.m
  86. 1
      test cases/objcpp/1 simple/prog.mm
  87. 1
      test cases/osx/7 bitcode/libbar.mm
  88. 1
      test cases/osx/7 bitcode/libfoo.m
  89. 1
      test cases/unit/12 promote/meson.build
  90. 1
      test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build
  91. 1
      test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build
  92. 1
      test cases/unit/12 promote/subprojects/s2/meson.build
  93. 1
      test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build
  94. 1
      test cases/unit/17 prebuilt shared/meson.build
  95. 1
      test cases/unit/27 pkgconfig usage/dependee/meson.build
  96. 1
      test cases/unit/3 subproject defaults/meson.build
  97. 1
      test cases/unit/3 subproject defaults/subprojects/foob/meson.build
  98. 2
      test cases/unit/32 pkgconfig use libraries/lib/meson.build
  99. 1
      test cases/unit/44 promote wrap/meson.build
  100. 1
      test cases/unit/44 promote wrap/subprojects/s1/meson.build
  101. Some files were not shown because too many files have changed in this diff Show More

@ -4,6 +4,7 @@ root = true
charset = utf-8 charset = utf-8
end_of_line = lf end_of_line = lf
indent_style = space indent_style = space
trim_trailing_whitespace = true
[*.[ch]] [*.[ch]]
indent_size = 4 indent_size = 4

@ -28,4 +28,3 @@ system = 'darwin'
cpu_family = 'aarch64' cpu_family = 'aarch64'
cpu = 'aarch64' cpu = 'aarch64'
endian = 'little' endian = 'little'

@ -25,4 +25,3 @@ system = 'darwin'
cpu_family = 'arm' cpu_family = 'arm'
cpu = 'arm64' cpu = 'arm64'
endian = 'little' endian = 'little'

@ -15,4 +15,3 @@ system = 'emscripten'
cpu_family = 'wasm32' cpu_family = 'wasm32'
cpu = 'wasm32' cpu = 'wasm32'
endian = 'little' endian = 'little'

@ -422,4 +422,3 @@ ret=$?
esac esac
return ret return ret

@ -357,4 +357,3 @@ also allows `//` as the id. This way, `meson rewrite kwargs set project
All keys of the `configuration_data` object can be obtained with the `keys()` All keys of the `configuration_data` object can be obtained with the `keys()`
method as an alphabetically sorted array. method as an alphabetically sorted array.

@ -354,4 +354,3 @@ The `b_sanitize` option for enabling Address sanitizer now works with
the Visual Studio compilers. This requires [a sufficiently new version the Visual Studio compilers. This requires [a sufficiently new version
of Visual of Visual
Studio](https://devblogs.microsoft.com/cppblog/address-sanitizer-for-msvc-now-generally-available/). Studio](https://devblogs.microsoft.com/cppblog/address-sanitizer-for-msvc-now-generally-available/).

@ -232,4 +232,3 @@ the cache upon installation. Most applications do that using a custom script,
but it can now be done by Meson directly. but it can now be done by Meson directly.
See [`gnome.post_install()`](Gnome-module.md#gnomepost_install). See [`gnome.post_install()`](Gnome-module.md#gnomepost_install).

@ -9,4 +9,3 @@ script.
On Linux you must build the package on the oldest distribution you On Linux you must build the package on the oldest distribution you
plan to support (Debian stable/oldstable and old CentOS are the common plan to support (Debian stable/oldstable and old CentOS are the common
choice here). choice here).

@ -1224,4 +1224,3 @@ FORBIDDEN_TARGET_NAMES = {'clean': None,
'dist': None, 'dist': None,
'distcheck': None, 'distcheck': None,
} }

@ -164,4 +164,3 @@ class ObjCppProject(SampleImpl):
open(lib_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_template.format(**kwargs)) open(lib_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_template.format(**kwargs))
open(test_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_test_template.format(**kwargs)) open(test_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_test_template.format(**kwargs))
open('meson.build', 'w', encoding='utf-8').write(lib_objcpp_meson_template.format(**kwargs)) open('meson.build', 'w', encoding='utf-8').write(lib_objcpp_meson_template.format(**kwargs))

@ -114,4 +114,3 @@ if __name__ == '__main__':
pg = PkgGenerator() pg = PkgGenerator()
pg.build_dist() pg.build_dist()
pg.build_package() pg.build_package()

@ -1,2 +1 @@
configure_file(output : 'blank.txt', configuration : configuration_data()) configure_file(output : 'blank.txt', configuration : configuration_data())

@ -17,4 +17,3 @@ assert(a.has('WORLD'), 'New config data should have been set')
assert(not b.has('WORLD'), 'New config data set should not affect var copied earlier') assert(not b.has('WORLD'), 'New config data set should not affect var copied earlier')
configure_file(output : 'a.h', configuration : a) configure_file(output : 'a.h', configuration : a)

@ -1,4 +1,3 @@
project('skip', 'c') project('skip', 'c')
error('MESON_SKIP_TEST this test is always skipped.') error('MESON_SKIP_TEST this test is always skipped.')

@ -25,4 +25,3 @@
int main(void) { int main(void) {
return 0; return 0;
} }

@ -7,4 +7,3 @@ void func(void) {
int main(void) { int main(void) {
return 0; return 0;
} }

@ -3,4 +3,3 @@
int main(void) { int main(void) {
return FOO + BAR; return FOO + BAR;
} }

@ -7,4 +7,3 @@ void func(void) {
int main(void) { int main(void) {
return 0; return 0;
} }

@ -8,4 +8,3 @@ void func(void) {
int main(void) { int main(void) {
return 0; return 0;
} }

@ -0,0 +1,2 @@
[meson.build]
trim_trailing_whitespace = false

@ -41,4 +41,3 @@ p = executable('simdtest', 'simdchecker.c', 'fallback.c',
link_with : simdlibs) link_with : simdlibs)
test('simdtest', p) test('simdtest', p)

@ -34,4 +34,3 @@ void increment_sse2(float arr[4]) {
arr[2] = (float)darr[3]; arr[2] = (float)darr[3];
arr[3] = (float)darr[2]; arr[3] = (float)darr[2];
} }

@ -2,4 +2,3 @@ project('dotinclude', 'c')
executable('dotproc', 'dotproc.c', executable('dotproc', 'dotproc.c',
implicit_include_directories : false) implicit_include_directories : false)

@ -12,4 +12,3 @@ int func2(void);
#endif #endif
int DLL_PUBLIC func(void) { return func2(); } int DLL_PUBLIC func(void) { return func2(); }

@ -7,4 +7,3 @@ subproject('a')
liba_dep = dependency('a', liba_dep = dependency('a',
fallback: ['a', 'liba_dep'], fallback: ['a', 'liba_dep'],
version: ['>= 0.30.0', '!= 0.99.0']) version: ['>= 0.30.0', '!= 0.99.0'])

@ -9,4 +9,3 @@ endif
executable('main', 'main.cpp') executable('main', 'main.cpp')
error('Unreachable') error('Unreachable')

@ -4,4 +4,3 @@ int main(void)
{ {
return call_foo() == 42 ? 0 : 1; return call_foo() == 42 ? 0 : 1;
} }

@ -4,4 +4,3 @@ int func(void)
{ {
return 1; return 1;
} }

@ -3,4 +3,3 @@
import os import os
assert os.environ['MY_PATH'] == os.pathsep.join(['0', '1', '2']) assert os.environ['MY_PATH'] == os.pathsep.join(['0', '1', '2'])

@ -12,4 +12,3 @@ int func2(void);
#endif #endif
int DLL_PUBLIC func(void) { return func2(); } int DLL_PUBLIC func(void) { return func2(); }

@ -15,4 +15,3 @@ output : 'vcstag-fallback.c')
executable('tagprog', 'tagprog.c', version_src) executable('tagprog', 'tagprog.c', version_src)
executable('tagprog-custom', 'tagprog.c', version_src_custom) executable('tagprog-custom', 'tagprog.c', version_src_custom)
executable('tagprog-fallback', 'tagprog.c', version_src_fallback) executable('tagprog-fallback', 'tagprog.c', version_src_fallback)

@ -6,4 +6,3 @@ int main(void) {
printf("Version is %s\n", vcstag); printf("Version is %s\n", vcstag);
return 0; return 0;
} }

@ -1,2 +1 @@
const char *vcstag = "@VCS_TAG@"; const char *vcstag = "@VCS_TAG@";

@ -6,4 +6,3 @@ test('fobj', executable('fobj', prog0, lib0))
subdir('subdir1') subdir('subdir1')
subdir('subdir2') subdir('subdir2')

@ -20,4 +20,3 @@ int func(void) {
#else #else
#error "Missing type definition." #error "Missing type definition."
#endif #endif

@ -9,4 +9,3 @@ h1 = install_headers('rootdir.h')
h2 = install_headers(as_array, subdir : 'subdir') h2 = install_headers(as_array, subdir : 'subdir')
h3 = install_headers(subheader) h3 = install_headers(subheader)
h4 = install_headers(disabler()) h4 = install_headers(disabler())

@ -1,2 +1 @@
subheader = files('fileheader.h') subheader = files('fileheader.h')

@ -2,4 +2,3 @@ project('simple', 'cuda', version : '1.0.0')
exe = executable('prog', 'prog.cu') exe = executable('prog', 'prog.cu')
test('cudatest', exe) test('cudatest', exe)

@ -27,4 +27,3 @@ int main(void) {
return 0; return 0;
} }

@ -2,4 +2,3 @@ project('simple', 'cuda', version : '1.0.0')
exe = executable('prog', 'prog.cu') exe = executable('prog', 'prog.cu')
test('cudatest', exe) test('cudatest', exe)

@ -1,5 +1,3 @@
[binaries] [binaries]
cuda = 'nvcc' cuda = 'nvcc'

@ -27,4 +27,3 @@ int main(void) {
return 0; return 0;
} }

@ -24,4 +24,3 @@ if cuda.version().version_compare('>=4.0')
assert (cuda.has_header_symbol('thrust/device_vector.h', 'thrust::device_vector'), 'thrust::device_vector not found') assert (cuda.has_header_symbol('thrust/device_vector.h', 'thrust::device_vector'), 'thrust::device_vector not found')
assert (not cuda.has_header_symbol('thrust/fill.h', 'thrust::sort'), 'thrust::sort should not be defined in thrust/fill.h') assert (not cuda.has_header_symbol('thrust/fill.h', 'thrust::sort'), 'thrust::sort should not be defined in thrust/fill.h')
endif endif

@ -27,4 +27,3 @@ int run_tests(void) {
return 0; return 0;
} }

@ -10,4 +10,3 @@ int do_cuda_stuff(void) {
printf("Hello, World!\n"); printf("Hello, World!\n");
return 0; return 0;
} }

@ -4,4 +4,3 @@ exe = executable('prog', 'main.cpp', 'lib.cu')
test('cudatest', exe) test('cudatest', exe)
subdir('static') subdir('static')

@ -10,4 +10,3 @@ int do_cuda_stuff() {
printf("Hello, World!\n"); printf("Hello, World!\n");
return 0; return 0;
} }

@ -10,4 +10,3 @@ int do_cuda_stuff() {
printf("Hello, World!\n"); printf("Hello, World!\n");
return 0; return 0;
} }

@ -67,4 +67,3 @@ assert(' '.join(cuda.nvcc_arch_flags('10.2', 'Auto', detected: [])) ==
'-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 '+ '-gencode arch=compute_60,code=sm_60 -gencode arch=compute_61,code=sm_61 '+
'-gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 '+ '-gencode arch=compute_70,code=sm_70 -gencode arch=compute_75,code=sm_75 '+
'-gencode arch=compute_75,code=compute_75') '-gencode arch=compute_75,code=compute_75')

@ -27,4 +27,3 @@ int main(void) {
return 0; return 0;
} }

@ -11,4 +11,3 @@ TAG_PUBLIC int run_tests(void) {
return (int)cudaDeviceSynchronize(); return (int)cudaDeviceSynchronize();
} }

@ -11,4 +11,3 @@ TAG_PUBLIC int run_tests(void) {
return (int)cudaDeviceSynchronize(); return (int)cudaDeviceSynchronize();
} }

@ -1,2 +1 @@
ldyn = shared_library('stuff', 'libstuff.d', install : true) ldyn = shared_library('stuff', 'libstuff.d', install : true)

@ -7,4 +7,3 @@ void func() {
int main(int argc, char **argv) { int main(int argc, char **argv) {
return 0; return 0;
} }

@ -1,2 +1 @@
option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature')

@ -1,2 +1 @@
I'm only here because Git is stupid about empty dirs. I'm only here because Git is stupid about empty dirs.

@ -1,4 +1,3 @@
project('assign in kwarg', 'c') project('assign in kwarg', 'c')
executable('prog', 'dummy.c', args = 'prog.c') executable('prog', 'dummy.c', args = 'prog.c')

@ -3,4 +3,3 @@ project('abs subdir', 'c')
# For some reason people insist on doing this, probably # For some reason people insist on doing this, probably
# because Make has taught them to never rely on anything. # because Make has taught them to never rely on anything.
subdir(join_paths(meson.source_root(), 'bob')) subdir(join_paths(meson.source_root(), 'bob'))

@ -9,4 +9,3 @@ subdir('sub')
executable('sub/prog', pf) executable('sub/prog', pf)
error('Re-enable me once slash in name is finally prohibited.') error('Re-enable me once slash in name is finally prohibited.')

@ -1,2 +1 @@
pf = files('prog.c') pf = files('prog.c')

@ -3,4 +3,3 @@
# Decimal syntax is 123. # Decimal syntax is 123.
# Octal syntax is 0o123. # Octal syntax is 0o123.
fail_0123 = 0123 fail_0123 = 0123

@ -15,6 +15,3 @@ endif
if fc.run(code).returncode() != 123 if fc.run(code).returncode() != 123
error('Fortran 2008 code failed to run') error('Fortran 2008 code failed to run')
endif endif

@ -11,4 +11,3 @@ print *, 'Good!'
end procedure good end procedure good
end submodule parent end submodule parent

@ -8,4 +8,3 @@ length = pi
print *, length print *, length
end program end program

@ -6,4 +6,3 @@ is.project('spin',
'spin.v', 'spin.v',
constraint_file : 'spin.pcf', constraint_file : 'spin.pcf',
) )

@ -25,4 +25,3 @@ int main(void) {
return 0; return 0;
} }

@ -13,4 +13,3 @@ FOO_MAJOR_VERSION
FOO_MINOR_VERSION FOO_MINOR_VERSION
FOO_MICRO_VERSION FOO_MICRO_VERSION
</SECTION> </SECTION>

@ -14,4 +14,3 @@ html_target = custom_target('spede-docs',
command: [doxygen, doxyfile], command: [doxygen, doxyfile],
install: true, install: true,
install_dir: datadir) install_dir: datadir)

@ -25,4 +25,3 @@ else
endif endif
subdir('doc') subdir('doc')

@ -1,3 +1,2 @@
index.md index.md
c-index c-index

@ -12,4 +12,3 @@ assert(hotdoc.has_extensions(['gi-extension']) == true,
assert(hotdoc.has_extensions(['gi-extension', 'no-way-you-exist-extension']) == false, assert(hotdoc.has_extensions(['gi-extension', 'no-way-you-exist-extension']) == false,
'A hotdoc extension called "no-way-you-exist-extension" should never be found.') 'A hotdoc extension called "no-way-you-exist-extension" should never be found.')

@ -24,4 +24,3 @@ int main(int argc, char **argv) {
} }
#include"manualinclude.moc" #include"manualinclude.moc"

@ -3,4 +3,3 @@ Name=Test
GenericName=Application GenericName=Application
Comment=Test Application Comment=Test Application
Type=Application Type=Application

@ -3,4 +3,3 @@ Name=Test
GenericName=Application GenericName=Application
Comment=Test Application Comment=Test Application
Type=Application Type=Application

@ -3,4 +3,3 @@ Name=Test 2
GenericName=Application GenericName=Application
Comment=Test Application Comment=Test Application
Type=Application Type=Application

@ -3,4 +3,3 @@ Name=Test 2
GenericName=@NAME@ GenericName=@NAME@
Comment=Test Application Comment=Test Application
Type=Application Type=Application

@ -3,4 +3,3 @@ Name=Test 2
GenericName=@NAME@ GenericName=@NAME@
Comment=Test Application Comment=Test Application
Type=Application Type=Application

@ -3,4 +3,3 @@ Name=Test
GenericName=Application GenericName=Application
Description=Test Application Description=Test Application
Type=Application Type=Application

@ -6,4 +6,3 @@ javaprog = jar('myprog', 'com/mesonbuild/Simple.java',
main_class : 'com.mesonbuild.Simple', main_class : 'com.mesonbuild.Simple',
java_args : ['-source', '1.7']) java_args : ['-source', '1.7'])
test('mytest', javaprog) test('mytest', javaprog)

@ -10,4 +10,3 @@ endif
if conf.has_key('CONFIG_NOT_IS_SET') if conf.has_key('CONFIG_NOT_IS_SET')
error('Expected CONFIG_NOT_IS_SET not be set, but it was') error('Expected CONFIG_NOT_IS_SET not be set, but it was')
endif endif

@ -10,4 +10,3 @@ endif
if conf.has_key('CONFIG_NOT_IS_SET') if conf.has_key('CONFIG_NOT_IS_SET')
error('Expected CONFIG_NOT_IS_SET not be set, but it was') error('Expected CONFIG_NOT_IS_SET not be set, but it was')
endif endif

@ -7,4 +7,3 @@ int main(void) {
[str release]; [str release];
return result; return result;
} }

@ -6,4 +6,3 @@ class MyClass {
int main(void) { int main(void) {
return 0; return 0;
} }

@ -4,4 +4,3 @@
int EXPORT_PUBLIC libbar(void) { int EXPORT_PUBLIC libbar(void) {
return 0; return 0;
} }

@ -4,4 +4,3 @@
int EXPORT_PUBLIC libfoo(void) { int EXPORT_PUBLIC libfoo(void) {
return 0; return 0;
} }

@ -2,4 +2,3 @@ project('promotion test', 'c')
subproject('s1') subproject('s1')
subproject('s2') subproject('s2')

@ -1,4 +1,3 @@
project('s3', 'c') project('s3', 'c')
l = static_library('s3', 's3.c') l = static_library('s3', 's3.c')

@ -1,4 +1,3 @@
project('scommon', 'c') project('scommon', 'c')
clib = static_library('scommon', 'scommon_broken.c') clib = static_library('scommon', 'scommon_broken.c')

@ -3,4 +3,3 @@ project('s2', 'c')
sc = subproject('scommon') sc = subproject('scommon')
executable('s2', 's2.c', link_with : sc.get_variable('clib')) executable('s2', 's2.c', link_with : sc.get_variable('clib'))

@ -1,4 +1,3 @@
project('scommon', 'c') project('scommon', 'c')
clib = static_library('scommon', 'scommon_ok.c') clib = static_library('scommon', 'scommon_ok.c')

@ -11,4 +11,3 @@ d = declare_dependency(dependencies : shlib)
exe2 = executable('another_visitor', 'another_visitor.c', exe2 = executable('another_visitor', 'another_visitor.c',
dependencies : d) dependencies : d)
test('another', exe2) test('another', exe2)

@ -4,4 +4,3 @@ pkgdep = dependency('libpkgdep')
executable('pkguser', 'pkguser.c', executable('pkguser', 'pkguser.c',
dependencies : pkgdep) dependencies : pkgdep)

@ -8,4 +8,3 @@ subproject('foob', default_options : ['fromspfunc=spfunc', 'fromspfunconly=spfun
assert(get_option('fromcmdline') == 'cmdline', 'Default option defined in cmd line is incorrect: ' + get_option('fromcmdline')) assert(get_option('fromcmdline') == 'cmdline', 'Default option defined in cmd line is incorrect: ' + get_option('fromcmdline'))
assert(get_option('defopoverride') == 'defopt', 'Default option without cmd line override is incorrect: ' + get_option('defopoverride')) assert(get_option('defopoverride') == 'defopt', 'Default option without cmd line override is incorrect: ' + get_option('defopoverride'))
assert(get_option('fromoptfile') == 'optfile', 'Default value from option file is incorrect: ' + get_option('fromoptfile')) assert(get_option('fromoptfile') == 'optfile', 'Default value from option file is incorrect: ' + get_option('fromoptfile'))

@ -9,4 +9,3 @@ assert(get_option('fromspfunc') == 'spfunc', 'Default option set with subproject
assert(get_option('fromspfunconly') == 'spfunc', 'Default option set with subproject() incorrect: ' + get_option('fromspfunc')) assert(get_option('fromspfunconly') == 'spfunc', 'Default option set with subproject() incorrect: ' + get_option('fromspfunc'))
assert(get_option('defopoverride') == 's_defopt', 'Default option without cmd line override is incorrect: ' + get_option('defopoverride')) assert(get_option('defopoverride') == 's_defopt', 'Default option without cmd line override is incorrect: ' + get_option('defopoverride'))
assert(get_option('fromoptfile') == 's_optfile', 'Default value from option file is incorrect: ' + get_option('fromoptfile')) assert(get_option('fromoptfile') == 's_optfile', 'Default value from option file is incorrect: ' + get_option('fromoptfile'))

@ -12,5 +12,3 @@ import('pkgconfig').generate(
libraries: [b], libraries: [b],
subdirs: ['.'] subdirs: ['.']
) )

@ -2,4 +2,3 @@ project('promotion test', 'c')
subproject('s1') subproject('s1')
subproject('s2') subproject('s2')

@ -1,2 +1 @@
project('s1', 'c') project('s1', 'c')

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save