diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-06-09 14:57:15 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-08-15 09:36:18 -0400 |
| commit | 59d4f771d280cbea0d0afc9579e127225751c028 (patch) | |
| tree | 6454a837f8d8e95ddb69331756e54bcbf03b86f1 /test cases/unit | |
| parent | c2592bc921f9357a187d241b233f2be0178195e9 (diff) | |
| download | meson-59d4f771d280cbea0d0afc9579e127225751c028.tar.gz | |
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.
Diffstat (limited to 'test cases/unit')
27 files changed, 7 insertions, 30 deletions
diff --git a/test cases/unit/12 promote/meson.build b/test cases/unit/12 promote/meson.build index 066cf36cf..5012bf6ed 100644 --- a/test cases/unit/12 promote/meson.build +++ b/test cases/unit/12 promote/meson.build @@ -2,4 +2,3 @@ project('promotion test', 'c') subproject('s1') subproject('s2') - diff --git a/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build index 894fe265b..71db691d6 100644 --- a/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build +++ b/test cases/unit/12 promote/subprojects/s1/subprojects/s3/meson.build @@ -1,4 +1,3 @@ project('s3', 'c') l = static_library('s3', 's3.c') - diff --git a/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build index 231f2757b..8ca550ae3 100644 --- a/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build +++ b/test cases/unit/12 promote/subprojects/s1/subprojects/scommon/meson.build @@ -1,4 +1,3 @@ project('scommon', 'c') clib = static_library('scommon', 'scommon_broken.c') - diff --git a/test cases/unit/12 promote/subprojects/s2/meson.build b/test cases/unit/12 promote/subprojects/s2/meson.build index 32bcf8f39..4aaeb59e8 100644 --- a/test cases/unit/12 promote/subprojects/s2/meson.build +++ b/test cases/unit/12 promote/subprojects/s2/meson.build @@ -3,4 +3,3 @@ project('s2', 'c') sc = subproject('scommon') executable('s2', 's2.c', link_with : sc.get_variable('clib')) - diff --git a/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build index e0d8c7ddc..54049a8be 100644 --- a/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build +++ b/test cases/unit/12 promote/subprojects/s2/subprojects/scommon/meson.build @@ -1,4 +1,3 @@ project('scommon', 'c') clib = static_library('scommon', 'scommon_ok.c') - diff --git a/test cases/unit/17 prebuilt shared/meson.build b/test cases/unit/17 prebuilt shared/meson.build index 41c11c656..9a4eca0f3 100644 --- a/test cases/unit/17 prebuilt shared/meson.build +++ b/test cases/unit/17 prebuilt shared/meson.build @@ -11,4 +11,3 @@ d = declare_dependency(dependencies : shlib) exe2 = executable('another_visitor', 'another_visitor.c', dependencies : d) test('another', exe2) - diff --git a/test cases/unit/27 pkgconfig usage/dependee/meson.build b/test cases/unit/27 pkgconfig usage/dependee/meson.build index beb446c18..03e294e58 100644 --- a/test cases/unit/27 pkgconfig usage/dependee/meson.build +++ b/test cases/unit/27 pkgconfig usage/dependee/meson.build @@ -4,4 +4,3 @@ pkgdep = dependency('libpkgdep') executable('pkguser', 'pkguser.c', dependencies : pkgdep) - diff --git a/test cases/unit/27 pkgconfig usage/dependency/meson.build b/test cases/unit/27 pkgconfig usage/dependency/meson.build index 89fae8e00..ee0f1dadb 100644 --- a/test cases/unit/27 pkgconfig usage/dependency/meson.build +++ b/test cases/unit/27 pkgconfig usage/dependency/meson.build @@ -1,10 +1,10 @@ -project('pkgconfig dep', 'c', +project('pkgconfig dep', 'c', version : '1.0.0') # This is not used in the code, only to check that it does not # leak out to --libs. glib_dep = dependency('glib-2.0') - + pkgconfig = import('pkgconfig') intlib = static_library('libpkgdep-int', 'privatelib.c') @@ -15,7 +15,7 @@ lib = shared_library('pkgdep', 'pkgdep.c', install : true) install_headers('pkgdep.h') - + pkgconfig.generate( filebase : 'libpkgdep', name : 'Libpkgdep', diff --git a/test cases/unit/3 subproject defaults/meson.build b/test cases/unit/3 subproject defaults/meson.build index 3bf05d036..dafa40aff 100644 --- a/test cases/unit/3 subproject defaults/meson.build +++ b/test cases/unit/3 subproject defaults/meson.build @@ -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('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')) - diff --git a/test cases/unit/3 subproject defaults/subprojects/foob/meson.build b/test cases/unit/3 subproject defaults/subprojects/foob/meson.build index 69f01d1ba..9a611a9e6 100644 --- a/test cases/unit/3 subproject defaults/subprojects/foob/meson.build +++ b/test cases/unit/3 subproject defaults/subprojects/foob/meson.build @@ -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('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')) - diff --git a/test cases/unit/32 pkgconfig use libraries/lib/meson.build b/test cases/unit/32 pkgconfig use libraries/lib/meson.build index 748adf47a..e9918cee4 100644 --- a/test cases/unit/32 pkgconfig use libraries/lib/meson.build +++ b/test cases/unit/32 pkgconfig use libraries/lib/meson.build @@ -12,5 +12,3 @@ import('pkgconfig').generate( libraries: [b], subdirs: ['.'] ) - - diff --git a/test cases/unit/44 promote wrap/meson.build b/test cases/unit/44 promote wrap/meson.build index 066cf36cf..5012bf6ed 100644 --- a/test cases/unit/44 promote wrap/meson.build +++ b/test cases/unit/44 promote wrap/meson.build @@ -2,4 +2,3 @@ project('promotion test', 'c') subproject('s1') subproject('s2') - diff --git a/test cases/unit/44 promote wrap/subprojects/s1/meson.build b/test cases/unit/44 promote wrap/subprojects/s1/meson.build index 3d1f5bc35..48dc8533d 100644 --- a/test cases/unit/44 promote wrap/subprojects/s1/meson.build +++ b/test cases/unit/44 promote wrap/subprojects/s1/meson.build @@ -1,2 +1 @@ project('s1', 'c') - diff --git a/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build index 296adff4c..b485d8337 100644 --- a/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build +++ b/test cases/unit/44 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build @@ -1,2 +1 @@ project('ambiguous', 'c') - diff --git a/test cases/unit/44 promote wrap/subprojects/s2/meson.build b/test cases/unit/44 promote wrap/subprojects/s2/meson.build index b5db63429..901bc2aac 100644 --- a/test cases/unit/44 promote wrap/subprojects/s2/meson.build +++ b/test cases/unit/44 promote wrap/subprojects/s2/meson.build @@ -1,2 +1 @@ project('s2', 'c') - diff --git a/test cases/unit/5 compiler detection/trivial.mm b/test cases/unit/5 compiler detection/trivial.mm index 927e8104e..f9d4e1989 100644 --- a/test cases/unit/5 compiler detection/trivial.mm +++ b/test cases/unit/5 compiler detection/trivial.mm @@ -6,4 +6,3 @@ class MyClass { int main(int argc, char **argv) { return 0; } - diff --git a/test cases/unit/51 noncross options/meson.build b/test cases/unit/51 noncross options/meson.build index 42e2cbb55..6d479d60a 100644 --- a/test cases/unit/51 noncross options/meson.build +++ b/test cases/unit/51 noncross options/meson.build @@ -7,7 +7,7 @@ executable('prog', 'prog.c') if not meson.is_cross_build() executable('prog2', 'prog.c', native: true) - + # Check that even deps marked as native are found # by default when not cross compiling. dependency('ylib', method: 'pkg-config') diff --git a/test cases/unit/54 clang-format/meson.build b/test cases/unit/54 clang-format/meson.build index 1b93cd54d..09973dbea 100644 --- a/test cases/unit/54 clang-format/meson.build +++ b/test cases/unit/54 clang-format/meson.build @@ -1,4 +1,3 @@ project('clangformat', 'c') executable('prog', 'prog.c') - diff --git a/test cases/unit/54 clang-format/prog_orig_c b/test cases/unit/54 clang-format/prog_orig_c index f098bbcce..23a2b574b 100644 --- a/test cases/unit/54 clang-format/prog_orig_c +++ b/test cases/unit/54 clang-format/prog_orig_c @@ -18,4 +18,3 @@ return 0 ; } - diff --git a/test cases/unit/60 native file override/meson.build b/test cases/unit/60 native file override/meson.build index 8318abaef..6ada560ff 100644 --- a/test cases/unit/60 native file override/meson.build +++ b/test cases/unit/60 native file override/meson.build @@ -4,7 +4,7 @@ foreach o : ['bindir', 'datadir', 'includedir', 'infodir', 'libdir', 'libexecdir', 'localedir', 'localstatedir', 'mandir', 'prefix', 'sbindir', 'sharedstatedir', 'sysconfdir'] expected = get_option('def_' + o) - actual = get_option(o) + actual = get_option(o) assert(expected == actual, '@0@ should have been @1@, but was @2@!'.format(o, expected, actual)) endforeach diff --git a/test cases/unit/7 run installed/foo/meson.build b/test cases/unit/7 run installed/foo/meson.build index 082f98529..772b181f0 100644 --- a/test cases/unit/7 run installed/foo/meson.build +++ b/test cases/unit/7 run installed/foo/meson.build @@ -4,4 +4,3 @@ foolib = shared_library('foo', 'foo.c', install_dir : 'foo', install : true) - diff --git a/test cases/unit/7 run installed/meson.build b/test cases/unit/7 run installed/meson.build index 46236fa83..af307f5f8 100644 --- a/test cases/unit/7 run installed/meson.build +++ b/test cases/unit/7 run installed/meson.build @@ -6,4 +6,3 @@ subdir('foo') executable('prog', 'prog.c', link_with : foolib, install : true) - diff --git a/test cases/unit/70 cross/meson.build b/test cases/unit/70 cross/meson.build index 6c85cf73b..acf4f0f17 100644 --- a/test cases/unit/70 cross/meson.build +++ b/test cases/unit/70 cross/meson.build @@ -11,6 +11,6 @@ if get_option('generate') output: 'crossfile', configuration: conf_data) message('Written cross file') -else +else assert(meson.is_cross_build(), 'not setup as cross build') endif diff --git a/test cases/unit/87 prelinking/meson.build b/test cases/unit/87 prelinking/meson.build index 3dbf88e5f..baa90084b 100644 --- a/test cases/unit/87 prelinking/meson.build +++ b/test cases/unit/87 prelinking/meson.build @@ -5,4 +5,3 @@ liba = static_library('prelinked', 'file1.c', 'file2.c', 'file3.c', 'file4.c', exe = executable('testprog', 'main.c', link_with: liba) test('prelinked', exe) -
\ No newline at end of file diff --git a/test cases/unit/9 d dedup/meson.build b/test cases/unit/9 d dedup/meson.build index 08f3a6c67..a7b6a8275 100644 --- a/test cases/unit/9 d dedup/meson.build +++ b/test cases/unit/9 d dedup/meson.build @@ -3,4 +3,3 @@ project('d dedup', 'c') add_project_arguments('-D', 'FOO', '-D', 'BAR', language : 'c') executable('prog', 'prog.c') - diff --git a/test cases/unit/97 link full name/libtestprovider/meson.build b/test cases/unit/97 link full name/libtestprovider/meson.build index 5855c8180..128c213ac 100644 --- a/test cases/unit/97 link full name/libtestprovider/meson.build +++ b/test cases/unit/97 link full name/libtestprovider/meson.build @@ -16,5 +16,5 @@ pkg.generate( requires: [], libraries_private: ['-Wl,--whole-archive'] + ['-L${libdir}','-l:libtestprovider.a']+ - ['-Wl,--no-whole-archive'] + ['-Wl,--no-whole-archive'] ) diff --git a/test cases/unit/97 link full name/proguser/receiver.c b/test cases/unit/97 link full name/proguser/receiver.c index 594601cc8..65e9d8ea1 100644 --- a/test cases/unit/97 link full name/proguser/receiver.c +++ b/test cases/unit/97 link full name/proguser/receiver.c @@ -16,4 +16,3 @@ int main(void) { fprintf(stdout,"bad\n"); return TEST_FAILTURE; } - |
