From 59d4f771d280cbea0d0afc9579e127225751c028 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 9 Jun 2021 14:57:15 -0400 Subject: [PATCH] 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. --- .editorconfig | 1 + cross/iphone.txt | 1 - cross/tvos.txt | 1 - cross/wasm.txt | 1 - data/shell-completions/zsh/_meson | 1 - .../markdown/Adding-new-projects-to-wrapdb.md | 2 +- docs/markdown/Commands.md | 2 +- docs/markdown/Getting-meson_ptbr.md | 10 +++---- docs/markdown/Release-notes-for-0.57.0.md | 13 ++++---- docs/markdown/Release-notes-for-0.58.0.md | 3 +- docs/markdown/Release-notes-for-0.59.0.md | 3 +- manual tests/4 standalone binaries/readme.txt | 1 - mesonbuild/backend/xcodebackend.py | 30 +++++++++---------- mesonbuild/coredata.py | 1 - mesonbuild/dependencies/pkgconfig.py | 4 +-- mesonbuild/templates/objcpptemplates.py | 1 - packaging/createpkg.py | 1 - .../asm output/meson.build | 1 - .../meson.build | 1 - test cases/common/114 skip/meson.build | 1 - .../115 subproject project arguments/exe.cpp | 1 - test cases/common/13 pch/c/prog.c | 1 - test cases/common/13 pch/generated/prog.c | 1 - .../13 pch/withIncludeDirectories/prog.c | 1 - .../common/13 pch/withIncludeFile/prog.c | 1 - .../141 special characters/.editorconfig | 2 ++ test cases/common/147 simd/meson.build | 1 - test cases/common/147 simd/simd_sse2.c | 1 - test cases/common/149 dotinclude/meson.build | 1 - .../contrib/subprojects/alpha/a.c | 1 - .../var/subprojects/wrap_files_might_be_here | 2 +- .../169 source in dep/generated/meson.build | 4 +-- .../common/176 subproject version/meson.build | 1 - test cases/common/177 subdir_done/meson.build | 1 - test cases/common/230 external project/app.c | 1 - test cases/common/230 external project/func.c | 1 - test cases/common/33 run program/check-env.py | 1 - test cases/common/42 subproject/meson.build | 2 +- .../subprojects/sublib/meson.build | 2 +- .../subprojects/a/a.c | 1 - test cases/common/66 vcstag/meson.build | 1 - test cases/common/66 vcstag/tagprog.c | 1 - test cases/common/66 vcstag/vcstag.c.in | 1 - test cases/common/74 file object/meson.build | 1 - test cases/common/79 same basename/lib.c | 1 - .../common/9 header install/meson.build | 1 - .../common/9 header install/sub/meson.build | 1 - test cases/cuda/1 simple/meson.build | 1 - test cases/cuda/1 simple/prog.cu | 1 - .../cuda/13 cuda compiler setting/meson.build | 1 - .../13 cuda compiler setting/nativefile.ini | 2 -- .../cuda/13 cuda compiler setting/prog.cu | 1 - .../14 cuda has header symbol/meson.build | 1 - test cases/cuda/15 sanitizer/prog.cu | 1 - test cases/cuda/2 split/lib.cu | 1 - test cases/cuda/2 split/meson.build | 1 - test cases/cuda/2 split/static/lib.cu | 1 - test cases/cuda/2 split/static/libsta.cu | 1 - test cases/cuda/3 cudamodule/meson.build | 1 - test cases/cuda/3 cudamodule/prog.cu | 1 - test cases/cuda/4 shared/shared/kernels.cu | 1 - test cases/cuda/5 threads/shared/kernels.cu | 1 - test cases/d/10 d cpp/cppmain.cpp | 6 ++-- test cases/d/3 shared library/sub/meson.build | 1 - test cases/d/9 features/app.d | 10 +++---- .../failing build/3 pch disabled/c/prog.c | 1 - .../106 feature require/meson_options.txt | 1 - .../failing/26 output subdir/subdir/dummy.txt | 1 - .../failing/40 kwarg assign/meson.build | 1 - test cases/failing/44 abs subdir/meson.build | 1 - test cases/failing/52 slashname/meson.build | 1 - .../failing/52 slashname/sub/meson.build | 1 - .../73 int literal leading zero/meson.build | 1 - .../11 compiles links runs/meson.build | 3 -- test cases/fortran/12 submodule/child.f90 | 1 - test cases/fortran/2 modules/prog.f90 | 1 - .../fortran/21 install static/main_lib.f90 | 2 +- test cases/fpga/1 simple/meson.build | 1 - test cases/fpga/1 simple/spin.v | 14 ++++----- .../frameworks/1 boost/partial_dep/main.cpp | 1 - .../doc/foobar1/foobar-sections.txt | 1 - .../frameworks/14 doxygen/doc/meson.build | 1 - test cases/frameworks/14 doxygen/meson.build | 1 - test cases/frameworks/15 llvm/sum.c | 2 +- .../frameworks/23 hotdoc/doc/sitemap.txt | 1 - test cases/frameworks/23 hotdoc/meson.build | 1 - test cases/frameworks/25 hdf5/main.f90 | 2 +- test cases/frameworks/4 qt/manualinclude.cpp | 1 - test cases/frameworks/4 qt/meson.build | 2 +- .../6 gettext/data/data3/test.desktop.in | 1 - .../frameworks/6 gettext/data/test.desktop.in | 1 - .../6 gettext/data/test2.desktop.in | 1 - .../6 gettext/data/test5.desktop.in.in | 1 - .../6 gettext/data/test6.desktop.in.in | 1 - .../6 gettext/data2/test.desktop.in | 1 - test cases/frameworks/6 gettext/po/LINGUAS | 1 - test cases/frameworks/8 flex/lexer.l | 2 +- test cases/frameworks/8 flex/testfile | 1 - .../sub/com/mesonbuild/TextPrinter.java | 4 +-- test cases/java/3 args/meson.build | 1 - .../com/mesonbuild/TextPrinter.java | 4 +-- .../6 codegen/com/mesonbuild/TextPrinter.java | 4 +-- test cases/keyval/2 subdir/dir/meson.build | 1 - .../3 load_config files/dir/meson.build | 1 - test cases/objc/2 nsstring/stringprog.m | 1 - test cases/objcpp/1 simple/prog.mm | 1 - test cases/osx/4 framework/meson.build | 2 +- test cases/osx/7 bitcode/libbar.mm | 1 - test cases/osx/7 bitcode/libfoo.m | 1 - test cases/unit/12 promote/meson.build | 1 - .../subprojects/s1/subprojects/s3/meson.build | 1 - .../s1/subprojects/scommon/meson.build | 1 - .../12 promote/subprojects/s2/meson.build | 1 - .../s2/subprojects/scommon/meson.build | 1 - .../unit/17 prebuilt shared/meson.build | 1 - .../27 pkgconfig usage/dependee/meson.build | 1 - .../27 pkgconfig usage/dependency/meson.build | 6 ++-- .../unit/3 subproject defaults/meson.build | 1 - .../subprojects/foob/meson.build | 1 - .../lib/meson.build | 2 -- test cases/unit/44 promote wrap/meson.build | 1 - .../subprojects/s1/meson.build | 1 - .../s1/subprojects/ambiguous/meson.build | 1 - .../subprojects/s2/meson.build | 1 - .../unit/5 compiler detection/trivial.mm | 1 - .../unit/51 noncross options/meson.build | 2 +- test cases/unit/54 clang-format/meson.build | 1 - test cases/unit/54 clang-format/prog_orig_c | 1 - .../unit/60 native file override/meson.build | 2 +- .../unit/7 run installed/foo/meson.build | 1 - test cases/unit/7 run installed/meson.build | 1 - test cases/unit/70 cross/meson.build | 2 +- test cases/unit/87 prelinking/meson.build | 1 - test cases/unit/9 d dedup/meson.build | 1 - .../libtestprovider/meson.build | 2 +- .../97 link full name/proguser/receiver.c | 1 - .../20 genie multiple mixed sources/init.gs | 1 - .../enum-types.c.template | 8 ++--- test cases/vala/9 gir/meson.build | 1 - test cases/wasm/1 basic/hello.c | 1 - test cases/wasm/1 basic/hello.cpp | 1 - test cases/wasm/2 threads/threads.c | 6 ++-- .../6 vs module defs/subdir/somedll.def | 1 - tools/copy_files.py | 6 ++-- unittests/allplatformstests.py | 2 -- unittests/baseplatformtests.py | 1 - unittests/darwintests.py | 1 - unittests/datatests.py | 1 - unittests/failuretests.py | 1 - unittests/linuxcrosstests.py | 1 - unittests/linuxliketests.py | 11 ++++--- unittests/machinefiletests.py | 1 - unittests/pythontests.py | 1 - unittests/rewritetests.py | 1 - unittests/subprojectscommandtests.py | 1 - unittests/taptests.py | 1 - 156 files changed, 89 insertions(+), 216 deletions(-) create mode 100644 test cases/common/141 special characters/.editorconfig diff --git a/.editorconfig b/.editorconfig index c2dd5d06a..6401c2512 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,6 +4,7 @@ root = true charset = utf-8 end_of_line = lf indent_style = space +trim_trailing_whitespace = true [*.[ch]] indent_size = 4 diff --git a/cross/iphone.txt b/cross/iphone.txt index c02e6a3c9..6346248b6 100644 --- a/cross/iphone.txt +++ b/cross/iphone.txt @@ -28,4 +28,3 @@ system = 'darwin' cpu_family = 'aarch64' cpu = 'aarch64' endian = 'little' - diff --git a/cross/tvos.txt b/cross/tvos.txt index 833f04bfd..a7d5dd182 100644 --- a/cross/tvos.txt +++ b/cross/tvos.txt @@ -25,4 +25,3 @@ system = 'darwin' cpu_family = 'arm' cpu = 'arm64' endian = 'little' - diff --git a/cross/wasm.txt b/cross/wasm.txt index 4289c0021..e03a10b01 100644 --- a/cross/wasm.txt +++ b/cross/wasm.txt @@ -15,4 +15,3 @@ system = 'emscripten' cpu_family = 'wasm32' cpu = 'wasm32' endian = 'little' - diff --git a/data/shell-completions/zsh/_meson b/data/shell-completions/zsh/_meson index cd9357b04..008ffb3af 100644 --- a/data/shell-completions/zsh/_meson +++ b/data/shell-completions/zsh/_meson @@ -422,4 +422,3 @@ ret=$? esac return ret - diff --git a/docs/markdown/Adding-new-projects-to-wrapdb.md b/docs/markdown/Adding-new-projects-to-wrapdb.md index 7b51c9af0..03998cdfa 100644 --- a/docs/markdown/Adding-new-projects-to-wrapdb.md +++ b/docs/markdown/Adding-new-projects-to-wrapdb.md @@ -130,7 +130,7 @@ git commit -a -m 'Add wrap files for libfoo-1.0.0' git push -u origin libfoo ``` -Now you should create a pull request on GitHub. +Now you should create a pull request on GitHub. If packaging review requires you to do changes, use the `--amend` argument to `commit` so that your branch will have only one commit. diff --git a/docs/markdown/Commands.md b/docs/markdown/Commands.md index ea68cc8f3..d53f651e4 100644 --- a/docs/markdown/Commands.md +++ b/docs/markdown/Commands.md @@ -62,7 +62,7 @@ Builds a default or a specified target of a configured Meson project. - `NAME`: name of the target from `meson.build` (e.g. `foo` from `executable('foo', ...)`). - `PATH`: path to the target relative to the root `meson.build` file. Note: relative path for a target specified in the root `meson.build` is `./`. - `TYPE`: type of the target. Can be one of the following: 'executable', 'static_library', 'shared_library', 'shared_module', 'custom', 'run', 'jar'. - + `PATH` and/or `TYPE` can be omitted if the resulting `TARGET` can be used to uniquely identify the target in `meson.build`. diff --git a/docs/markdown/Getting-meson_ptbr.md b/docs/markdown/Getting-meson_ptbr.md index f2e2811ec..b5af345b0 100644 --- a/docs/markdown/Getting-meson_ptbr.md +++ b/docs/markdown/Getting-meson_ptbr.md @@ -1,6 +1,6 @@ # Obtendo o Meson -Meson é implementado em Python 3, e requer a versão 3.6 ou mais nova. +Meson é implementado em Python 3, e requer a versão 3.6 ou mais nova. se o seu sistema operacional provê um gerenciador de pacotes, você deve instalar o Meson com ele. Para plataformas que não tem um gerenciador de pacotes, você precisa baixa-lo da [página inicial do Python]. Veja abaixo @@ -26,7 +26,7 @@ plataformas. O Meson está disponível no [Indice de Pacotes do Python] e pode ser instalado com `sudo pip3 install meson` que requer root e vai instala-lo para todo o sistema. -Se você já baixou uma cópia do código do Meson, você pode instalar com +Se você já baixou uma cópia do código do Meson, você pode instalar com `sudo pip3 install path/to/source/root/`. Como alternativa, você pode usar o `pip3 install --user meson` que vai instalar @@ -54,7 +54,7 @@ Clang, Visual Studio, MinGW, ICC, ARMCC, etc. Você deve usar a versão provida pelo seu gerenciador de pacotes se possível, caso contrário, baixe o binário executável da [página de *release* do projeto Ninja](https://github.com/ninja-build/ninja/releases). -Se você apenas usa o *backend* do Visual Studio (`--backend=vs`) para gerar soluções do Visual Studio no Windows ou o +Se você apenas usa o *backend* do Visual Studio (`--backend=vs`) para gerar soluções do Visual Studio no Windows ou o *backend* do XCode (`--backend=xcode`) para gerar projetos no macOS, você não precisa do Ninja. @@ -72,7 +72,7 @@ que você selecione as opções do instalador como a seguir: ![passo 3 do instalador](images/py3-install-3.png "Opções Avançadas: ative 'Instalar para todos usuários'") -Com isso, você terá o `python` e o `pip` no `PATH`, e você poderá instalar o Meson com o pip. Você também vai poder +Com isso, você terá o `python` e o `pip` no `PATH`, e você poderá instalar o Meson com o pip. Você também vai poder executar o comando `meson` em qualquer shell no Windows ao invés de ter que executar `py -3` com o caminho completo para o *script* `meson.py`. @@ -80,7 +80,7 @@ o *script* `meson.py`. Se você está usando o MSYS2 no Windows como seu ambiente de desenvolvimento, por favor se certifique que você não esteja usando o pacote `msys/python` para -fornecer o Python 3. Uso o `mingw32/mingw-w64-i686-python3` ou o +fornecer o Python 3. Uso o `mingw32/mingw-w64-i686-python3` ou o If you are using MSYS2 on Windows as your development environment, please make sure that you **do not use** the `msys/python` package to provide Python 3. Use either `mingw32/mingw-w64-i686-python3` or `mingw64/mingw-w64-x86_64-python3` diff --git a/docs/markdown/Release-notes-for-0.57.0.md b/docs/markdown/Release-notes-for-0.57.0.md index 595ebec01..14fa03073 100644 --- a/docs/markdown/Release-notes-for-0.57.0.md +++ b/docs/markdown/Release-notes-for-0.57.0.md @@ -105,7 +105,7 @@ Run Time Checking can be enabled by manually adding `/RTC1` or other RTC flags o The `debug` buildtype for clang-cl added additional arguments compared to MSVC, which had more to do with optimization than debug. The arguments removed are `/Ob0`, `/Od`, `/RTC1`. (`/Zi` was also removed, but it is already added by default when debug is enabled.) -If these are important issues for you and would like builtin toggle options, +If these are important issues for you and would like builtin toggle options, please file an issue in the Meson bug tracker. ## Buildtype remains even if dependent options are changed @@ -154,17 +154,17 @@ Currently supports `glib-compile-schemas`, `gio-querymodules`, and ## "Edit and continue" (/ZI) is no longer used by default for Visual Studio -Meson was adding the `/ZI` compiler argument as an argument for Visual Studio -in debug mode. This enables the `edit-and-continue` debugging in +Meson was adding the `/ZI` compiler argument as an argument for Visual Studio +in debug mode. This enables the `edit-and-continue` debugging in Visual Studio IDE's. -Unfortunately, it is also extremely expensive and breaks certain use cases such -as link time code generation. Edit and continue can be enabled by manually by +Unfortunately, it is also extremely expensive and breaks certain use cases such +as link time code generation. Edit and continue can be enabled by manually by adding `/ZI` to compiler arguments. The `/ZI` argument has now been replaced by the `/Zi` argument for debug builds. -If this is an important issue for you and would like a builtin toggle option, +If this is an important issue for you and would like a builtin toggle option, please file an issue in the Meson bug tracker. ## Minimum required Python version updated to 3.6 @@ -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()` method as an alphabetically sorted array. - diff --git a/docs/markdown/Release-notes-for-0.58.0.md b/docs/markdown/Release-notes-for-0.58.0.md index 9a23abb7f..7187dc1fb 100644 --- a/docs/markdown/Release-notes-for-0.58.0.md +++ b/docs/markdown/Release-notes-for-0.58.0.md @@ -266,7 +266,7 @@ argument that will be separated by space. ## Specify man page locale during installation Locale directories can now be passed to `install_man`: - + ```meson # instead of # install_data('foo.fr.1', install_dir: join_paths(get_option('mandir'), 'fr', 'man1'), rename: 'foo.1')` @@ -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 of Visual Studio](https://devblogs.microsoft.com/cppblog/address-sanitizer-for-msvc-now-generally-available/). - diff --git a/docs/markdown/Release-notes-for-0.59.0.md b/docs/markdown/Release-notes-for-0.59.0.md index b6ce6541c..a8fbc358c 100644 --- a/docs/markdown/Release-notes-for-0.59.0.md +++ b/docs/markdown/Release-notes-for-0.59.0.md @@ -121,7 +121,7 @@ if intl_found conf.set('ENABLE_NLS', 1) endif ``` - + one may simply use: ``` @@ -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. See [`gnome.post_install()`](Gnome-module.md#gnomepost_install). - diff --git a/manual tests/4 standalone binaries/readme.txt b/manual tests/4 standalone binaries/readme.txt index 991b5c6b8..b689779af 100644 --- a/manual tests/4 standalone binaries/readme.txt +++ b/manual tests/4 standalone binaries/readme.txt @@ -9,4 +9,3 @@ script. On Linux you must build the package on the oldest distribution you plan to support (Debian stable/oldstable and old CentOS are the common choice here). - diff --git a/mesonbuild/backend/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 59fb7d700..c67828f1e 100644 --- a/mesonbuild/backend/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -534,7 +534,7 @@ class XCodeBackend(backends.Backend): target_dependencies = list(map(lambda t: self.pbx_dep_map[t], self.build_targets)) custom_target_dependencies = [self.pbx_custom_dep_map[t] for t in self.custom_targets] aggregated_targets = [] - aggregated_targets.append((self.all_id, 'ALL_BUILD', + aggregated_targets.append((self.all_id, 'ALL_BUILD', self.all_buildconf_id, [], [self.regen_dependency_id] + target_dependencies + custom_target_dependencies)) @@ -554,7 +554,7 @@ class XCodeBackend(backends.Backend): build_phases = [] dependencies = [self.regen_dependency_id] generator_id = 0 - for s in t.sources: + for s in t.sources: if not isinstance(s, build.GeneratedList): continue build_phases.append(self.shell_targets[(tname, generator_id)]) @@ -602,7 +602,7 @@ class XCodeBackend(backends.Backend): if s.is_built: in_build_dir = True s = os.path.join(s.subdir, s.fname) - + if not isinstance(s, str): continue sdict = PbxDict() @@ -610,7 +610,7 @@ class XCodeBackend(backends.Backend): idval = self.buildfile_ids[k] fileref = self.fileref_ids[k] if in_build_dir: - fullpath = os.path.join(self.environment.get_build_dir(), s) + fullpath = os.path.join(self.environment.get_build_dir(), s) else: fullpath = os.path.join(self.environment.get_source_dir(), s) compiler_args = '' @@ -644,7 +644,7 @@ class XCodeBackend(backends.Backend): for g in t.generated: if not isinstance(g, build.GeneratedList): continue - self.create_generator_shellphase(objects_dict, tname, generator_id) + self.create_generator_shellphase(objects_dict, tname, generator_id) generator_id += 1 # Custom targets are shell build phases in Xcode terminology. @@ -661,7 +661,7 @@ class XCodeBackend(backends.Backend): for g in t.sources: if not isinstance(g, build.GeneratedList): continue - self.create_generator_shellphase(objects_dict, tname, generator_id) + self.create_generator_shellphase(objects_dict, tname, generator_id) generator_id += 1 def create_generator_shellphase(self, objects_dict, tname, generator_id): @@ -752,7 +752,7 @@ class XCodeBackend(backends.Backend): name = os.path.basename(o) objects_dict.add_item(ref_id, odict, o) xcodetype = self.get_xcodetype(o) - rel_name = mesonlib.relpath(o, self.environment.get_source_dir()) + rel_name = mesonlib.relpath(o, self.environment.get_source_dir()) odict.add_item('isa', 'PBXFileReference') odict.add_item('explicitFileType', '"' + xcodetype + '"') odict.add_item('fileEncoding', '4') @@ -773,7 +773,7 @@ class XCodeBackend(backends.Backend): o = os.path.join(t.subdir, o) fullpath = os.path.join(self.environment.get_source_dir(), o) idval = self.fileref_ids[(tname, o)] - rel_name = mesonlib.relpath(fullpath, self.environment.get_source_dir()) + rel_name = mesonlib.relpath(fullpath, self.environment.get_source_dir()) o_dict = PbxDict() name = os.path.basename(o) objects_dict.add_item(idval, o_dict, fullpath) @@ -974,7 +974,7 @@ class XCodeBackend(backends.Backend): target_children.add_item(self.fileref_ids[(tid, s)], s) for o in t.objects: if isinstance(o, build.ExtractedObjects): - # Do not show built object files in the project tree. + # Do not show built object files in the project tree. continue if isinstance(o, mesonlib.File): o = os.path.join(o.subdir, o.fname) @@ -1083,7 +1083,7 @@ class XCodeBackend(backends.Backend): dep_array.add_item(self.pbx_custom_dep_map[o.get_id()], o.name) elif isinstance(o, build.CustomTargetIndex): dep_array.add_item(self.pbx_custom_dep_map[o.target.get_id()], o.target.name) - + generator_id += 1 ntarget_dict.add_item('name', f'"{tname}"') @@ -1353,7 +1353,7 @@ class XCodeBackend(backends.Backend): warn_array = PbxArray() warn_array.add_item('"$(inherited)"') settings_dict.add_item('WARNING_CFLAGS', warn_array) - + bt_dict.add_item('name', f'"{buildtype}"') # Then the test target. @@ -1410,7 +1410,7 @@ class XCodeBackend(backends.Backend): dep_libs += sub_libs links_dylib = links_dylib or sub_links_dylib return (dep_libs, links_dylib) - + def generate_single_build_target(self, objects_dict, target_name, target): for buildtype in self.buildtypes: dep_libs = [] @@ -1444,7 +1444,7 @@ class XCodeBackend(backends.Backend): product_name = target.get_basename() ldargs += target.link_args # Swift is special. Again. You can't mix Swift with other languages - # in the same target. Thus for Swift we only use + # in the same target. Thus for Swift we only use if self.is_swift_target(target): linker, stdlib_args = target.compilers['swift'], [] else: @@ -1468,7 +1468,7 @@ class XCodeBackend(backends.Backend): generator_id = 0 for o in target.generated: if isinstance(o, build.GeneratedList): - outputs = self.generator_outputs[target_name, generator_id] + outputs = self.generator_outputs[target_name, generator_id] generator_id += 1 for o_abs in outputs: if o_abs.endswith('.o') or o_abs.endswith('.obj'): @@ -1701,7 +1701,7 @@ class XCodeBackend(backends.Backend): pbxdict.add_item('objectVersion', '46') objects_dict = PbxDict() pbxdict.add_item('objects', objects_dict) - + return objects_dict def generate_suffix(self, pbxdict): diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 37d830de2..ea74e7c12 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -1224,4 +1224,3 @@ FORBIDDEN_TARGET_NAMES = {'clean': None, 'dist': None, 'distcheck': None, } - diff --git a/mesonbuild/dependencies/pkgconfig.py b/mesonbuild/dependencies/pkgconfig.py index d047e813e..a7ba603f0 100644 --- a/mesonbuild/dependencies/pkgconfig.py +++ b/mesonbuild/dependencies/pkgconfig.py @@ -278,9 +278,9 @@ class PkgConfigDependency(ExternalDependency): continue elif lib.startswith('-l:'): # see: https://stackoverflow.com/questions/48532868/gcc-library-option-with-a-colon-llibevent-a - # also : See the documentation of -lnamespec | --library=namespec in the linker manual + # also : See the documentation of -lnamespec | --library=namespec in the linker manual # https://sourceware.org/binutils/docs-2.18/ld/Options.html - + # Don't resolve the same -l:libfoo.a argument again if lib in libs_found: continue diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py index 4f61d6c60..11a509136 100644 --- a/mesonbuild/templates/objcpptemplates.py +++ b/mesonbuild/templates/objcpptemplates.py @@ -164,4 +164,3 @@ class ObjCppProject(SampleImpl): 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('meson.build', 'w', encoding='utf-8').write(lib_objcpp_meson_template.format(**kwargs)) - diff --git a/packaging/createpkg.py b/packaging/createpkg.py index b85845fa4..95a70944b 100755 --- a/packaging/createpkg.py +++ b/packaging/createpkg.py @@ -114,4 +114,3 @@ if __name__ == '__main__': pg = PkgGenerator() pg.build_dist() pg.build_package() - diff --git a/test cases/common/107 spaces backslash/asm output/meson.build b/test cases/common/107 spaces backslash/asm output/meson.build index b5f13f5ca..43f61f08e 100644 --- a/test cases/common/107 spaces backslash/asm output/meson.build +++ b/test cases/common/107 spaces backslash/asm output/meson.build @@ -1,2 +1 @@ configure_file(output : 'blank.txt', configuration : configuration_data()) - diff --git a/test cases/common/113 interpreter copy mutable var on assignment/meson.build b/test cases/common/113 interpreter copy mutable var on assignment/meson.build index 8b15357ad..b54fec9f0 100644 --- a/test cases/common/113 interpreter copy mutable var on assignment/meson.build +++ b/test cases/common/113 interpreter copy mutable var on assignment/meson.build @@ -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') configure_file(output : 'a.h', configuration : a) - diff --git a/test cases/common/114 skip/meson.build b/test cases/common/114 skip/meson.build index 1adedb6fd..16e29c90e 100644 --- a/test cases/common/114 skip/meson.build +++ b/test cases/common/114 skip/meson.build @@ -1,4 +1,3 @@ project('skip', 'c') error('MESON_SKIP_TEST this test is always skipped.') - diff --git a/test cases/common/115 subproject project arguments/exe.cpp b/test cases/common/115 subproject project arguments/exe.cpp index 9cfaec4a2..a8f5dff33 100644 --- a/test cases/common/115 subproject project arguments/exe.cpp +++ b/test cases/common/115 subproject project arguments/exe.cpp @@ -25,4 +25,3 @@ int main(void) { return 0; } - diff --git a/test cases/common/13 pch/c/prog.c b/test cases/common/13 pch/c/prog.c index 124bba063..4ef2fd8a7 100644 --- a/test cases/common/13 pch/c/prog.c +++ b/test cases/common/13 pch/c/prog.c @@ -7,4 +7,3 @@ void func(void) { int main(void) { return 0; } - diff --git a/test cases/common/13 pch/generated/prog.c b/test cases/common/13 pch/generated/prog.c index 6765ac102..a75c2d23b 100644 --- a/test cases/common/13 pch/generated/prog.c +++ b/test cases/common/13 pch/generated/prog.c @@ -3,4 +3,3 @@ int main(void) { return FOO + BAR; } - diff --git a/test cases/common/13 pch/withIncludeDirectories/prog.c b/test cases/common/13 pch/withIncludeDirectories/prog.c index 124bba063..4ef2fd8a7 100644 --- a/test cases/common/13 pch/withIncludeDirectories/prog.c +++ b/test cases/common/13 pch/withIncludeDirectories/prog.c @@ -7,4 +7,3 @@ void func(void) { int main(void) { return 0; } - diff --git a/test cases/common/13 pch/withIncludeFile/prog.c b/test cases/common/13 pch/withIncludeFile/prog.c index 7a9a93c6a..9d495f6f1 100644 --- a/test cases/common/13 pch/withIncludeFile/prog.c +++ b/test cases/common/13 pch/withIncludeFile/prog.c @@ -8,4 +8,3 @@ void func(void) { int main(void) { return 0; } - diff --git a/test cases/common/141 special characters/.editorconfig b/test cases/common/141 special characters/.editorconfig new file mode 100644 index 000000000..6c026f8fb --- /dev/null +++ b/test cases/common/141 special characters/.editorconfig @@ -0,0 +1,2 @@ +[meson.build] +trim_trailing_whitespace = false diff --git a/test cases/common/147 simd/meson.build b/test cases/common/147 simd/meson.build index 2628a1234..101fdb863 100644 --- a/test cases/common/147 simd/meson.build +++ b/test cases/common/147 simd/meson.build @@ -41,4 +41,3 @@ p = executable('simdtest', 'simdchecker.c', 'fallback.c', link_with : simdlibs) test('simdtest', p) - diff --git a/test cases/common/147 simd/simd_sse2.c b/test cases/common/147 simd/simd_sse2.c index 445afb631..3a57a5b58 100644 --- a/test cases/common/147 simd/simd_sse2.c +++ b/test cases/common/147 simd/simd_sse2.c @@ -34,4 +34,3 @@ void increment_sse2(float arr[4]) { arr[2] = (float)darr[3]; arr[3] = (float)darr[2]; } - diff --git a/test cases/common/149 dotinclude/meson.build b/test cases/common/149 dotinclude/meson.build index e0c2cd7a0..f094ba1f2 100644 --- a/test cases/common/149 dotinclude/meson.build +++ b/test cases/common/149 dotinclude/meson.build @@ -2,4 +2,3 @@ project('dotinclude', 'c') executable('dotproc', 'dotproc.c', implicit_include_directories : false) - diff --git a/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/a.c index f9848c136..102041e3e 100644 --- a/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/a.c +++ b/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/a.c @@ -12,4 +12,3 @@ int func2(void); #endif int DLL_PUBLIC func(void) { return func2(); } - diff --git a/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here index 8d1c8b69c..8b1378917 100644 --- a/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here +++ b/test cases/common/167 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here @@ -1 +1 @@ - + diff --git a/test cases/common/169 source in dep/generated/meson.build b/test cases/common/169 source in dep/generated/meson.build index 286270901..fade382bc 100644 --- a/test cases/common/169 source in dep/generated/meson.build +++ b/test cases/common/169 source in dep/generated/meson.build @@ -4,9 +4,9 @@ genh = custom_target('genh', input : 'funname', output : 'funheader.h', command : [fp, '@INPUT@', '@OUTPUT@']) - + dep = declare_dependency(sources : [genh]) - + e = executable('genuser', 'main.c', dependencies : dep) test('genuser', e) diff --git a/test cases/common/176 subproject version/meson.build b/test cases/common/176 subproject version/meson.build index bd8fc0392..071466db7 100644 --- a/test cases/common/176 subproject version/meson.build +++ b/test cases/common/176 subproject version/meson.build @@ -7,4 +7,3 @@ subproject('a') liba_dep = dependency('a', fallback: ['a', 'liba_dep'], version: ['>= 0.30.0', '!= 0.99.0']) - diff --git a/test cases/common/177 subdir_done/meson.build b/test cases/common/177 subdir_done/meson.build index 457e613b1..1ed697777 100644 --- a/test cases/common/177 subdir_done/meson.build +++ b/test cases/common/177 subdir_done/meson.build @@ -9,4 +9,3 @@ endif executable('main', 'main.cpp') error('Unreachable') - diff --git a/test cases/common/230 external project/app.c b/test cases/common/230 external project/app.c index 166f00737..a8266e769 100644 --- a/test cases/common/230 external project/app.c +++ b/test cases/common/230 external project/app.c @@ -4,4 +4,3 @@ int main(void) { return call_foo() == 42 ? 0 : 1; } - diff --git a/test cases/common/230 external project/func.c b/test cases/common/230 external project/func.c index 5e8f933f5..31393fd65 100644 --- a/test cases/common/230 external project/func.c +++ b/test cases/common/230 external project/func.c @@ -4,4 +4,3 @@ int func(void) { return 1; } - diff --git a/test cases/common/33 run program/check-env.py b/test cases/common/33 run program/check-env.py index 7f106c633..ef04433c4 100644 --- a/test cases/common/33 run program/check-env.py +++ b/test cases/common/33 run program/check-env.py @@ -3,4 +3,3 @@ import os assert os.environ['MY_PATH'] == os.pathsep.join(['0', '1', '2']) - diff --git a/test cases/common/42 subproject/meson.build b/test cases/common/42 subproject/meson.build index 2b939d19b..7f322bcf4 100644 --- a/test cases/common/42 subproject/meson.build +++ b/test cases/common/42 subproject/meson.build @@ -1,4 +1,4 @@ -project('subproj user', 'c', +project('subproj user', 'c', version : '2.3.4', license : 'mylicense') diff --git a/test cases/common/42 subproject/subprojects/sublib/meson.build b/test cases/common/42 subproject/subprojects/sublib/meson.build index acaf1bf38..3a620fe27 100644 --- a/test cases/common/42 subproject/subprojects/sublib/meson.build +++ b/test cases/common/42 subproject/subprojects/sublib/meson.build @@ -1,4 +1,4 @@ -project('subproject', 'c', +project('subproject', 'c', version : '1.0.0', license : ['sublicense1', 'sublicense2']) diff --git a/test cases/common/46 subproject subproject/subprojects/a/a.c b/test cases/common/46 subproject subproject/subprojects/a/a.c index f9848c136..102041e3e 100644 --- a/test cases/common/46 subproject subproject/subprojects/a/a.c +++ b/test cases/common/46 subproject subproject/subprojects/a/a.c @@ -12,4 +12,3 @@ int func2(void); #endif int DLL_PUBLIC func(void) { return func2(); } - diff --git a/test cases/common/66 vcstag/meson.build b/test cases/common/66 vcstag/meson.build index 7e5983aaa..256d2e951 100644 --- a/test cases/common/66 vcstag/meson.build +++ b/test cases/common/66 vcstag/meson.build @@ -15,4 +15,3 @@ output : 'vcstag-fallback.c') executable('tagprog', 'tagprog.c', version_src) executable('tagprog-custom', 'tagprog.c', version_src_custom) executable('tagprog-fallback', 'tagprog.c', version_src_fallback) - diff --git a/test cases/common/66 vcstag/tagprog.c b/test cases/common/66 vcstag/tagprog.c index 27c3cc58d..554680255 100644 --- a/test cases/common/66 vcstag/tagprog.c +++ b/test cases/common/66 vcstag/tagprog.c @@ -6,4 +6,3 @@ int main(void) { printf("Version is %s\n", vcstag); return 0; } - diff --git a/test cases/common/66 vcstag/vcstag.c.in b/test cases/common/66 vcstag/vcstag.c.in index 09192d90d..6e6f7c5d6 100644 --- a/test cases/common/66 vcstag/vcstag.c.in +++ b/test cases/common/66 vcstag/vcstag.c.in @@ -1,2 +1 @@ const char *vcstag = "@VCS_TAG@"; - diff --git a/test cases/common/74 file object/meson.build b/test cases/common/74 file object/meson.build index c3ecb7be9..fc01bfec7 100644 --- a/test cases/common/74 file object/meson.build +++ b/test cases/common/74 file object/meson.build @@ -6,4 +6,3 @@ test('fobj', executable('fobj', prog0, lib0)) subdir('subdir1') subdir('subdir2') - diff --git a/test cases/common/79 same basename/lib.c b/test cases/common/79 same basename/lib.c index b3798e99e..5b9122baf 100644 --- a/test cases/common/79 same basename/lib.c +++ b/test cases/common/79 same basename/lib.c @@ -20,4 +20,3 @@ int func(void) { #else #error "Missing type definition." #endif - diff --git a/test cases/common/9 header install/meson.build b/test cases/common/9 header install/meson.build index 891cb596b..833b4d4da 100644 --- a/test cases/common/9 header install/meson.build +++ b/test cases/common/9 header install/meson.build @@ -9,4 +9,3 @@ h1 = install_headers('rootdir.h') h2 = install_headers(as_array, subdir : 'subdir') h3 = install_headers(subheader) h4 = install_headers(disabler()) - diff --git a/test cases/common/9 header install/sub/meson.build b/test cases/common/9 header install/sub/meson.build index 1ee0d1dd4..1cff4b2ac 100644 --- a/test cases/common/9 header install/sub/meson.build +++ b/test cases/common/9 header install/sub/meson.build @@ -1,2 +1 @@ subheader = files('fileheader.h') - diff --git a/test cases/cuda/1 simple/meson.build b/test cases/cuda/1 simple/meson.build index 19af734af..4f111d1b9 100644 --- a/test cases/cuda/1 simple/meson.build +++ b/test cases/cuda/1 simple/meson.build @@ -2,4 +2,3 @@ project('simple', 'cuda', version : '1.0.0') exe = executable('prog', 'prog.cu') test('cudatest', exe) - diff --git a/test cases/cuda/1 simple/prog.cu b/test cases/cuda/1 simple/prog.cu index b893bd331..06521b222 100644 --- a/test cases/cuda/1 simple/prog.cu +++ b/test cases/cuda/1 simple/prog.cu @@ -27,4 +27,3 @@ int main(void) { return 0; } - diff --git a/test cases/cuda/13 cuda compiler setting/meson.build b/test cases/cuda/13 cuda compiler setting/meson.build index 19af734af..4f111d1b9 100644 --- a/test cases/cuda/13 cuda compiler setting/meson.build +++ b/test cases/cuda/13 cuda compiler setting/meson.build @@ -2,4 +2,3 @@ project('simple', 'cuda', version : '1.0.0') exe = executable('prog', 'prog.cu') test('cudatest', exe) - diff --git a/test cases/cuda/13 cuda compiler setting/nativefile.ini b/test cases/cuda/13 cuda compiler setting/nativefile.ini index ffaad65fd..fb52e0dce 100644 --- a/test cases/cuda/13 cuda compiler setting/nativefile.ini +++ b/test cases/cuda/13 cuda compiler setting/nativefile.ini @@ -1,5 +1,3 @@ [binaries] cuda = 'nvcc' - - diff --git a/test cases/cuda/13 cuda compiler setting/prog.cu b/test cases/cuda/13 cuda compiler setting/prog.cu index b893bd331..06521b222 100644 --- a/test cases/cuda/13 cuda compiler setting/prog.cu +++ b/test cases/cuda/13 cuda compiler setting/prog.cu @@ -27,4 +27,3 @@ int main(void) { return 0; } - diff --git a/test cases/cuda/14 cuda has header symbol/meson.build b/test cases/cuda/14 cuda has header symbol/meson.build index b29c52e58..a23892df5 100644 --- a/test cases/cuda/14 cuda has header symbol/meson.build +++ b/test cases/cuda/14 cuda has header symbol/meson.build @@ -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 (not cuda.has_header_symbol('thrust/fill.h', 'thrust::sort'), 'thrust::sort should not be defined in thrust/fill.h') endif - diff --git a/test cases/cuda/15 sanitizer/prog.cu b/test cases/cuda/15 sanitizer/prog.cu index 340b07aea..581680966 100644 --- a/test cases/cuda/15 sanitizer/prog.cu +++ b/test cases/cuda/15 sanitizer/prog.cu @@ -27,4 +27,3 @@ int run_tests(void) { return 0; } - diff --git a/test cases/cuda/2 split/lib.cu b/test cases/cuda/2 split/lib.cu index 850d7ddfb..e8919335f 100644 --- a/test cases/cuda/2 split/lib.cu +++ b/test cases/cuda/2 split/lib.cu @@ -10,4 +10,3 @@ int do_cuda_stuff(void) { printf("Hello, World!\n"); return 0; } - diff --git a/test cases/cuda/2 split/meson.build b/test cases/cuda/2 split/meson.build index 51bf6ce23..2e2bec1c6 100644 --- a/test cases/cuda/2 split/meson.build +++ b/test cases/cuda/2 split/meson.build @@ -4,4 +4,3 @@ exe = executable('prog', 'main.cpp', 'lib.cu') test('cudatest', exe) subdir('static') - diff --git a/test cases/cuda/2 split/static/lib.cu b/test cases/cuda/2 split/static/lib.cu index c0471d048..757c9b50d 100644 --- a/test cases/cuda/2 split/static/lib.cu +++ b/test cases/cuda/2 split/static/lib.cu @@ -10,4 +10,3 @@ int do_cuda_stuff() { printf("Hello, World!\n"); return 0; } - diff --git a/test cases/cuda/2 split/static/libsta.cu b/test cases/cuda/2 split/static/libsta.cu index c0471d048..757c9b50d 100644 --- a/test cases/cuda/2 split/static/libsta.cu +++ b/test cases/cuda/2 split/static/libsta.cu @@ -10,4 +10,3 @@ int do_cuda_stuff() { printf("Hello, World!\n"); return 0; } - diff --git a/test cases/cuda/3 cudamodule/meson.build b/test cases/cuda/3 cudamodule/meson.build index fd5e83fea..5c3ed6073 100644 --- a/test cases/cuda/3 cudamodule/meson.build +++ b/test cases/cuda/3 cudamodule/meson.build @@ -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_70,code=sm_70 -gencode arch=compute_75,code=sm_75 '+ '-gencode arch=compute_75,code=compute_75') - diff --git a/test cases/cuda/3 cudamodule/prog.cu b/test cases/cuda/3 cudamodule/prog.cu index b893bd331..06521b222 100644 --- a/test cases/cuda/3 cudamodule/prog.cu +++ b/test cases/cuda/3 cudamodule/prog.cu @@ -27,4 +27,3 @@ int main(void) { return 0; } - diff --git a/test cases/cuda/4 shared/shared/kernels.cu b/test cases/cuda/4 shared/shared/kernels.cu index 41a95536f..5cda629d8 100644 --- a/test cases/cuda/4 shared/shared/kernels.cu +++ b/test cases/cuda/4 shared/shared/kernels.cu @@ -11,4 +11,3 @@ TAG_PUBLIC int run_tests(void) { return (int)cudaDeviceSynchronize(); } - diff --git a/test cases/cuda/5 threads/shared/kernels.cu b/test cases/cuda/5 threads/shared/kernels.cu index 41a95536f..5cda629d8 100644 --- a/test cases/cuda/5 threads/shared/kernels.cu +++ b/test cases/cuda/5 threads/shared/kernels.cu @@ -11,4 +11,3 @@ TAG_PUBLIC int run_tests(void) { return (int)cudaDeviceSynchronize(); } - diff --git a/test cases/d/10 d cpp/cppmain.cpp b/test cases/d/10 d cpp/cppmain.cpp index ff90e3f41..bcd8c7afc 100644 --- a/test cases/d/10 d cpp/cppmain.cpp +++ b/test cases/d/10 d cpp/cppmain.cpp @@ -6,13 +6,13 @@ int main(int, char**) { // initialize D runtime if (!rt_init()) return 1; - + print_hello(1); - + // terminate D runtime, each initialize call // must be paired with a terminate call. if (!rt_term()) return 1; - + return 0; } diff --git a/test cases/d/3 shared library/sub/meson.build b/test cases/d/3 shared library/sub/meson.build index fb4b99661..1599a331c 100644 --- a/test cases/d/3 shared library/sub/meson.build +++ b/test cases/d/3 shared library/sub/meson.build @@ -1,2 +1 @@ ldyn = shared_library('stuff', 'libstuff.d', install : true) - diff --git a/test cases/d/9 features/app.d b/test cases/d/9 features/app.d index 05c56ca5f..ae59be139 100644 --- a/test cases/d/9 features/app.d +++ b/test cases/d/9 features/app.d @@ -41,19 +41,19 @@ void main (string[] args) exit (1); } } - + version (With_VersionInteger) version(3) exit(0); version (With_Debug) debug exit(0); - + version (With_DebugInteger) debug(3) exit(0); - + version (With_DebugIdentifier) debug(DebugIdentifier) exit(0); - + version (With_DebugAll) { int dbg = 0; debug dbg++; @@ -61,7 +61,7 @@ void main (string[] args) debug(3) dbg++; debug(4) dbg++; debug(DebugIdentifier) dbg++; - + if (dbg == 5) exit(0); } diff --git a/test cases/failing build/3 pch disabled/c/prog.c b/test cases/failing build/3 pch disabled/c/prog.c index 0ce3d0a24..f17bc9e1a 100644 --- a/test cases/failing build/3 pch disabled/c/prog.c +++ b/test cases/failing build/3 pch disabled/c/prog.c @@ -7,4 +7,3 @@ void func() { int main(int argc, char **argv) { return 0; } - diff --git a/test cases/failing/106 feature require/meson_options.txt b/test cases/failing/106 feature require/meson_options.txt index d6f2ce656..5910a8737 100644 --- a/test cases/failing/106 feature require/meson_options.txt +++ b/test cases/failing/106 feature require/meson_options.txt @@ -1,2 +1 @@ option('reqfeature', type : 'feature', value : 'enabled', description : 'A required feature') - diff --git a/test cases/failing/26 output subdir/subdir/dummy.txt b/test cases/failing/26 output subdir/subdir/dummy.txt index f10acf3e5..7e907f106 100644 --- a/test cases/failing/26 output subdir/subdir/dummy.txt +++ b/test cases/failing/26 output subdir/subdir/dummy.txt @@ -1,2 +1 @@ I'm only here because Git is stupid about empty dirs. - diff --git a/test cases/failing/40 kwarg assign/meson.build b/test cases/failing/40 kwarg assign/meson.build index c86786fd1..7d4252100 100644 --- a/test cases/failing/40 kwarg assign/meson.build +++ b/test cases/failing/40 kwarg assign/meson.build @@ -1,4 +1,3 @@ project('assign in kwarg', 'c') executable('prog', 'dummy.c', args = 'prog.c') - diff --git a/test cases/failing/44 abs subdir/meson.build b/test cases/failing/44 abs subdir/meson.build index 8c23224a4..5425245a7 100644 --- a/test cases/failing/44 abs subdir/meson.build +++ b/test cases/failing/44 abs subdir/meson.build @@ -3,4 +3,3 @@ project('abs subdir', 'c') # For some reason people insist on doing this, probably # because Make has taught them to never rely on anything. subdir(join_paths(meson.source_root(), 'bob')) - diff --git a/test cases/failing/52 slashname/meson.build b/test cases/failing/52 slashname/meson.build index bba5301bf..29fe1fceb 100644 --- a/test cases/failing/52 slashname/meson.build +++ b/test cases/failing/52 slashname/meson.build @@ -9,4 +9,3 @@ subdir('sub') executable('sub/prog', pf) error('Re-enable me once slash in name is finally prohibited.') - diff --git a/test cases/failing/52 slashname/sub/meson.build b/test cases/failing/52 slashname/sub/meson.build index e10489001..3baacf601 100644 --- a/test cases/failing/52 slashname/sub/meson.build +++ b/test cases/failing/52 slashname/sub/meson.build @@ -1,2 +1 @@ pf = files('prog.c') - diff --git a/test cases/failing/73 int literal leading zero/meson.build b/test cases/failing/73 int literal leading zero/meson.build index 7ad64ae09..87c776f49 100644 --- a/test cases/failing/73 int literal leading zero/meson.build +++ b/test cases/failing/73 int literal leading zero/meson.build @@ -3,4 +3,3 @@ # Decimal syntax is 123. # Octal syntax is 0o123. fail_0123 = 0123 - diff --git a/test cases/fortran/11 compiles links runs/meson.build b/test cases/fortran/11 compiles links runs/meson.build index 81eb90791..150c1a496 100644 --- a/test cases/fortran/11 compiles links runs/meson.build +++ b/test cases/fortran/11 compiles links runs/meson.build @@ -15,6 +15,3 @@ endif if fc.run(code).returncode() != 123 error('Fortran 2008 code failed to run') endif - - - diff --git a/test cases/fortran/12 submodule/child.f90 b/test cases/fortran/12 submodule/child.f90 index dc076ec47..98d89934b 100644 --- a/test cases/fortran/12 submodule/child.f90 +++ b/test cases/fortran/12 submodule/child.f90 @@ -11,4 +11,3 @@ print *, 'Good!' end procedure good end submodule parent - diff --git a/test cases/fortran/2 modules/prog.f90 b/test cases/fortran/2 modules/prog.f90 index 93b310f58..34f25bfbb 100644 --- a/test cases/fortran/2 modules/prog.f90 +++ b/test cases/fortran/2 modules/prog.f90 @@ -8,4 +8,3 @@ length = pi print *, length end program - diff --git a/test cases/fortran/21 install static/main_lib.f90 b/test cases/fortran/21 install static/main_lib.f90 index 5f3cb451a..874584d38 100644 --- a/test cases/fortran/21 install static/main_lib.f90 +++ b/test cases/fortran/21 install static/main_lib.f90 @@ -1,5 +1,5 @@ module main_lib - + use static_hello implicit none diff --git a/test cases/fpga/1 simple/meson.build b/test cases/fpga/1 simple/meson.build index eff8088ba..f1ab690fd 100644 --- a/test cases/fpga/1 simple/meson.build +++ b/test cases/fpga/1 simple/meson.build @@ -6,4 +6,3 @@ is.project('spin', 'spin.v', constraint_file : 'spin.pcf', ) - diff --git a/test cases/fpga/1 simple/spin.v b/test cases/fpga/1 simple/spin.v index edc40c426..2143d301e 100644 --- a/test cases/fpga/1 simple/spin.v +++ b/test cases/fpga/1 simple/spin.v @@ -1,29 +1,29 @@ module top(input clk, output LED1, output LED2, output LED3, output LED4, output LED5); - + reg ready = 0; reg [23:0] divider; reg [3:0] spin; - + always @(posedge clk) begin - if (ready) + if (ready) begin - if (divider == 6000000) + if (divider == 6000000) begin divider <= 0; spin <= {spin[2], spin[3], spin[0], spin[1]}; end - else + else divider <= divider + 1; end - else + else begin ready <= 1; spin <= 4'b1010; divider <= 0; end end - + assign LED1 = spin[0]; assign LED2 = spin[1]; assign LED3 = spin[2]; diff --git a/test cases/frameworks/1 boost/partial_dep/main.cpp b/test cases/frameworks/1 boost/partial_dep/main.cpp index f31c5ec75..b22ce3a6f 100644 --- a/test cases/frameworks/1 boost/partial_dep/main.cpp +++ b/test cases/frameworks/1 boost/partial_dep/main.cpp @@ -25,4 +25,3 @@ int main(void) { return 0; } - diff --git a/test cases/frameworks/10 gtk-doc/doc/foobar1/foobar-sections.txt b/test cases/frameworks/10 gtk-doc/doc/foobar1/foobar-sections.txt index d14c8dab0..e9ca2d63c 100644 --- a/test cases/frameworks/10 gtk-doc/doc/foobar1/foobar-sections.txt +++ b/test cases/frameworks/10 gtk-doc/doc/foobar1/foobar-sections.txt @@ -13,4 +13,3 @@ FOO_MAJOR_VERSION FOO_MINOR_VERSION FOO_MICRO_VERSION - diff --git a/test cases/frameworks/14 doxygen/doc/meson.build b/test cases/frameworks/14 doxygen/doc/meson.build index 5548b7685..bde2d7c81 100644 --- a/test cases/frameworks/14 doxygen/doc/meson.build +++ b/test cases/frameworks/14 doxygen/doc/meson.build @@ -14,4 +14,3 @@ html_target = custom_target('spede-docs', command: [doxygen, doxyfile], install: true, install_dir: datadir) - diff --git a/test cases/frameworks/14 doxygen/meson.build b/test cases/frameworks/14 doxygen/meson.build index 023aa0e63..517cef22a 100644 --- a/test cases/frameworks/14 doxygen/meson.build +++ b/test cases/frameworks/14 doxygen/meson.build @@ -25,4 +25,3 @@ else endif subdir('doc') - diff --git a/test cases/frameworks/15 llvm/sum.c b/test cases/frameworks/15 llvm/sum.c index a93588e5e..e35fe9597 100644 --- a/test cases/frameworks/15 llvm/sum.c +++ b/test cases/frameworks/15 llvm/sum.c @@ -1,4 +1,4 @@ -/** This code is public domain, and taken from +/** This code is public domain, and taken from * https://github.com/paulsmith/getting-started-llvm-c-api/blob/master/sum.c */ /** diff --git a/test cases/frameworks/23 hotdoc/doc/sitemap.txt b/test cases/frameworks/23 hotdoc/doc/sitemap.txt index b82354a1d..ba96be1c8 100644 --- a/test cases/frameworks/23 hotdoc/doc/sitemap.txt +++ b/test cases/frameworks/23 hotdoc/doc/sitemap.txt @@ -1,3 +1,2 @@ index.md c-index - diff --git a/test cases/frameworks/23 hotdoc/meson.build b/test cases/frameworks/23 hotdoc/meson.build index dd3c92acd..64cd6daab 100644 --- a/test cases/frameworks/23 hotdoc/meson.build +++ b/test cases/frameworks/23 hotdoc/meson.build @@ -12,4 +12,3 @@ assert(hotdoc.has_extensions(['gi-extension']) == true, 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.') - diff --git a/test cases/frameworks/25 hdf5/main.f90 b/test cases/frameworks/25 hdf5/main.f90 index b21abf186..45be14616 100644 --- a/test cases/frameworks/25 hdf5/main.f90 +++ b/test cases/frameworks/25 hdf5/main.f90 @@ -13,5 +13,5 @@ print '(A,I1,A1,I0.2,A1,I1)','Fortran HDF5 version ',major,'.',minor,'.',rel call h5close_f(ier) if (ier /= 0) error stop 'Unable to close HDF5 library' - + end program diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp index 2682dd9d2..60b94e510 100644 --- a/test cases/frameworks/4 qt/manualinclude.cpp +++ b/test cases/frameworks/4 qt/manualinclude.cpp @@ -24,4 +24,3 @@ int main(int argc, char **argv) { } #include"manualinclude.moc" - diff --git a/test cases/frameworks/4 qt/meson.build b/test cases/frameworks/4 qt/meson.build index f9fb21c52..2ec582581 100644 --- a/test cases/frameworks/4 qt/meson.build +++ b/test cases/frameworks/4 qt/meson.build @@ -51,7 +51,7 @@ foreach qt : ['qt4', 'qt5', 'qt6'] # requires you to do it properly or you get linker symbol clashes. prep = qtmodule.preprocess( - moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. + moc_headers : ['mainWindow.h'], # These need to be fed through the moc tool before use. method : get_option('method') ) # XML files that need to be compiled with the uic tol. diff --git a/test cases/frameworks/6 gettext/data/data3/test.desktop.in b/test cases/frameworks/6 gettext/data/data3/test.desktop.in index 33b9a9fd8..35edf07d4 100644 --- a/test cases/frameworks/6 gettext/data/data3/test.desktop.in +++ b/test cases/frameworks/6 gettext/data/data3/test.desktop.in @@ -3,4 +3,3 @@ Name=Test GenericName=Application Comment=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/data/test.desktop.in b/test cases/frameworks/6 gettext/data/test.desktop.in index 33b9a9fd8..35edf07d4 100644 --- a/test cases/frameworks/6 gettext/data/test.desktop.in +++ b/test cases/frameworks/6 gettext/data/test.desktop.in @@ -3,4 +3,3 @@ Name=Test GenericName=Application Comment=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/data/test2.desktop.in b/test cases/frameworks/6 gettext/data/test2.desktop.in index 41f931c36..23be0a44d 100644 --- a/test cases/frameworks/6 gettext/data/test2.desktop.in +++ b/test cases/frameworks/6 gettext/data/test2.desktop.in @@ -3,4 +3,3 @@ Name=Test 2 GenericName=Application Comment=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/data/test5.desktop.in.in b/test cases/frameworks/6 gettext/data/test5.desktop.in.in index c75bf7391..a401e36b1 100644 --- a/test cases/frameworks/6 gettext/data/test5.desktop.in.in +++ b/test cases/frameworks/6 gettext/data/test5.desktop.in.in @@ -3,4 +3,3 @@ Name=Test 2 GenericName=@NAME@ Comment=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/data/test6.desktop.in.in b/test cases/frameworks/6 gettext/data/test6.desktop.in.in index c75bf7391..a401e36b1 100644 --- a/test cases/frameworks/6 gettext/data/test6.desktop.in.in +++ b/test cases/frameworks/6 gettext/data/test6.desktop.in.in @@ -3,4 +3,3 @@ Name=Test 2 GenericName=@NAME@ Comment=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/data2/test.desktop.in b/test cases/frameworks/6 gettext/data2/test.desktop.in index 5c8ea2eb7..b57ba2146 100644 --- a/test cases/frameworks/6 gettext/data2/test.desktop.in +++ b/test cases/frameworks/6 gettext/data2/test.desktop.in @@ -3,4 +3,3 @@ Name=Test GenericName=Application Description=Test Application Type=Application - diff --git a/test cases/frameworks/6 gettext/po/LINGUAS b/test cases/frameworks/6 gettext/po/LINGUAS index c9274bff0..4cde210df 100644 --- a/test cases/frameworks/6 gettext/po/LINGUAS +++ b/test cases/frameworks/6 gettext/po/LINGUAS @@ -1,4 +1,3 @@ de fi ru - diff --git a/test cases/frameworks/8 flex/lexer.l b/test cases/frameworks/8 flex/lexer.l index 8ea7df8dd..ca6513cb8 100644 --- a/test cases/frameworks/8 flex/lexer.l +++ b/test cases/frameworks/8 flex/lexer.l @@ -3,7 +3,7 @@ #include "parser.tab.h" extern int yylex(void); -extern int yyerror(); +extern int yyerror(); %} %option noyywrap nounput noinput diff --git a/test cases/frameworks/8 flex/testfile b/test cases/frameworks/8 flex/testfile index 7eead1ee7..27ba77dda 100644 --- a/test cases/frameworks/8 flex/testfile +++ b/test cases/frameworks/8 flex/testfile @@ -1,2 +1 @@ true - diff --git a/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java b/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java index 7e330a60b..dc2771c37 100644 --- a/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java +++ b/test cases/java/2 subdir/sub/com/mesonbuild/TextPrinter.java @@ -3,11 +3,11 @@ package com.mesonbuild; class TextPrinter { private String msg; - + TextPrinter(String s) { msg = s; } - + public void print() { System.out.println(msg); } diff --git a/test cases/java/3 args/meson.build b/test cases/java/3 args/meson.build index 451e42d97..d13573f39 100644 --- a/test cases/java/3 args/meson.build +++ b/test cases/java/3 args/meson.build @@ -6,4 +6,3 @@ javaprog = jar('myprog', 'com/mesonbuild/Simple.java', main_class : 'com.mesonbuild.Simple', java_args : ['-source', '1.7']) test('mytest', javaprog) - diff --git a/test cases/java/5 includedirs/com/mesonbuild/TextPrinter.java b/test cases/java/5 includedirs/com/mesonbuild/TextPrinter.java index 7e330a60b..dc2771c37 100644 --- a/test cases/java/5 includedirs/com/mesonbuild/TextPrinter.java +++ b/test cases/java/5 includedirs/com/mesonbuild/TextPrinter.java @@ -3,11 +3,11 @@ package com.mesonbuild; class TextPrinter { private String msg; - + TextPrinter(String s) { msg = s; } - + public void print() { System.out.println(msg); } diff --git a/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java b/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java index 7e330a60b..dc2771c37 100644 --- a/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java +++ b/test cases/java/6 codegen/com/mesonbuild/TextPrinter.java @@ -3,11 +3,11 @@ package com.mesonbuild; class TextPrinter { private String msg; - + TextPrinter(String s) { msg = s; } - + public void print() { System.out.println(msg); } diff --git a/test cases/keyval/2 subdir/dir/meson.build b/test cases/keyval/2 subdir/dir/meson.build index 291ad93a2..3db80adbd 100644 --- a/test cases/keyval/2 subdir/dir/meson.build +++ b/test cases/keyval/2 subdir/dir/meson.build @@ -10,4 +10,3 @@ endif if conf.has_key('CONFIG_NOT_IS_SET') error('Expected CONFIG_NOT_IS_SET not be set, but it was') endif - diff --git a/test cases/keyval/3 load_config files/dir/meson.build b/test cases/keyval/3 load_config files/dir/meson.build index adc52892a..d8826eca5 100644 --- a/test cases/keyval/3 load_config files/dir/meson.build +++ b/test cases/keyval/3 load_config files/dir/meson.build @@ -10,4 +10,3 @@ endif if conf.has_key('CONFIG_NOT_IS_SET') error('Expected CONFIG_NOT_IS_SET not be set, but it was') endif - diff --git a/test cases/objc/2 nsstring/stringprog.m b/test cases/objc/2 nsstring/stringprog.m index faef4dd62..540753883 100644 --- a/test cases/objc/2 nsstring/stringprog.m +++ b/test cases/objc/2 nsstring/stringprog.m @@ -7,4 +7,3 @@ int main(void) { [str release]; return result; } - diff --git a/test cases/objcpp/1 simple/prog.mm b/test cases/objcpp/1 simple/prog.mm index d3bbf6c05..b26d5b7a9 100644 --- a/test cases/objcpp/1 simple/prog.mm +++ b/test cases/objcpp/1 simple/prog.mm @@ -6,4 +6,3 @@ class MyClass { int main(void) { return 0; } - diff --git a/test cases/osx/4 framework/meson.build b/test cases/osx/4 framework/meson.build index 4cd345fc9..d1f7036f8 100644 --- a/test cases/osx/4 framework/meson.build +++ b/test cases/osx/4 framework/meson.build @@ -3,7 +3,7 @@ # "Target Membership" of ... # - OpenGL.framework should be only to prog@exe # - Foundation.framework should be only to stat@sta -# "Build Phase" / "Link Binary with Libraries" for the target +# "Build Phase" / "Link Binary with Libraries" for the target # - "prog@exe" should be only "Foundation.framework" # - "stat@sta" should be only "OpenGL.framework" # see "xcode-frameworks.png" for an example diff --git a/test cases/osx/7 bitcode/libbar.mm b/test cases/osx/7 bitcode/libbar.mm index d9201c129..489b1d1f1 100644 --- a/test cases/osx/7 bitcode/libbar.mm +++ b/test cases/osx/7 bitcode/libbar.mm @@ -4,4 +4,3 @@ int EXPORT_PUBLIC libbar(void) { return 0; } - diff --git a/test cases/osx/7 bitcode/libfoo.m b/test cases/osx/7 bitcode/libfoo.m index f1c35a9f3..c0f4985ed 100644 --- a/test cases/osx/7 bitcode/libfoo.m +++ b/test cases/osx/7 bitcode/libfoo.m @@ -4,4 +4,3 @@ int EXPORT_PUBLIC libfoo(void) { return 0; } - 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; } - diff --git a/test cases/vala/20 genie multiple mixed sources/init.gs b/test cases/vala/20 genie multiple mixed sources/init.gs index 14bfbf8ac..1564403ba 100644 --- a/test cases/vala/20 genie multiple mixed sources/init.gs +++ b/test cases/vala/20 genie multiple mixed sources/init.gs @@ -8,4 +8,3 @@ init assert( new Vala.TestTwo().is_true() ) assert( c_test_one_is_true() ) assert( c_test_two_is_true() ) - diff --git a/test cases/vala/8 generated sources/dependency-generated/enum-types.c.template b/test cases/vala/8 generated sources/dependency-generated/enum-types.c.template index 85d74d11c..9d45a938d 100644 --- a/test cases/vala/8 generated sources/dependency-generated/enum-types.c.template +++ b/test cases/vala/8 generated sources/dependency-generated/enum-types.c.template @@ -15,7 +15,7 @@ GType @enum_name@_get_type (void) { static gsize static_g_define_type_id = 0; - + if (g_once_init_enter (&static_g_define_type_id)) { static const G@Type@Value values[] = { /*** END value-header ***/ @@ -27,12 +27,12 @@ GType /*** BEGIN value-tail ***/ { 0, NULL, NULL } }; - GType g_define_type_id = + GType g_define_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); - + g_once_init_leave (&static_g_define_type_id, g_define_type_id); } - + return static_g_define_type_id; } diff --git a/test cases/vala/9 gir/meson.build b/test cases/vala/9 gir/meson.build index 1a09bec2a..332052760 100644 --- a/test cases/vala/9 gir/meson.build +++ b/test cases/vala/9 gir/meson.build @@ -15,4 +15,3 @@ custom_target('foo-typelib', input: meson.current_build_dir() + '/Foo-1.0.gir', output: 'Foo-1.0.typelib', depends: foo) - diff --git a/test cases/wasm/1 basic/hello.c b/test cases/wasm/1 basic/hello.c index a104b3780..232880377 100644 --- a/test cases/wasm/1 basic/hello.c +++ b/test cases/wasm/1 basic/hello.c @@ -4,4 +4,3 @@ int main() { printf("Hello World\n"); return 0; } - diff --git a/test cases/wasm/1 basic/hello.cpp b/test cases/wasm/1 basic/hello.cpp index 119dc8b9f..44b14acf3 100644 --- a/test cases/wasm/1 basic/hello.cpp +++ b/test cases/wasm/1 basic/hello.cpp @@ -4,4 +4,3 @@ int main(void) { std::cout << "Hello World" << std::endl; return 0; } - diff --git a/test cases/wasm/2 threads/threads.c b/test cases/wasm/2 threads/threads.c index e79bff170..7b1a46e2f 100644 --- a/test cases/wasm/2 threads/threads.c +++ b/test cases/wasm/2 threads/threads.c @@ -10,9 +10,9 @@ void inthread(void * args) { int main() { #ifdef __EMSCRIPTEN_PTHREADS__ pthread_t thread_id; - printf("Before Thread\n"); - pthread_create(&thread_id, NULL, (void *)*inthread, NULL); - pthread_join(thread_id, NULL); + printf("Before Thread\n"); + pthread_create(&thread_id, NULL, (void *)*inthread, NULL); + pthread_join(thread_id, NULL); printf("After Thread\n"); return 0; #else diff --git a/test cases/windows/6 vs module defs/subdir/somedll.def b/test cases/windows/6 vs module defs/subdir/somedll.def index 217801bf5..60fd1a1ef 100644 --- a/test cases/windows/6 vs module defs/subdir/somedll.def +++ b/test cases/windows/6 vs module defs/subdir/somedll.def @@ -1,3 +1,2 @@ EXPORTS somedllfunc - diff --git a/tools/copy_files.py b/tools/copy_files.py index 39eaa0a66..de2518972 100644 --- a/tools/copy_files.py +++ b/tools/copy_files.py @@ -31,11 +31,11 @@ def copy_files(files: T.List[str], input_dir: PathLike, output_dir: PathLike) -> raise ValueError(f'Input directory value is not set') if not output_dir: raise ValueError(f'Output directory value is not set') - + input_dir = Path(input_dir).resolve() output_dir = Path(output_dir).resolve() output_dir.mkdir(parents=True, exist_ok=True) - + for f in files: if (input_dir/f).is_dir(): shutil.copytree(input_dir/f, output_dir/f) @@ -47,7 +47,7 @@ if __name__ == '__main__': parser.add_argument('files', metavar='FILE', nargs='*') parser.add_argument('-C', dest='input_dir', required=True) parser.add_argument('--output-dir', required=True) - + args = parser.parse_args() copy_files(files=args.files, diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index 92a9caf2b..b29634190 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -3761,5 +3761,3 @@ class AllPlatformTests(BasePlatformTests): cc = detect_compiler_for(env, 'c', MachineChoice.HOST) link_args = env.coredata.get_external_link_args(cc.for_machine, cc.language) self.assertEqual(sorted(link_args), sorted(['-flto'])) - - diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index 69ad0a179..7a3830ed9 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -435,4 +435,3 @@ class BasePlatformTests(TestCase): def assertPathDoesNotExist(self, path): m = f'Path {path!r} should not exist' self.assertFalse(os.path.exists(path), msg=m) - diff --git a/unittests/darwintests.py b/unittests/darwintests.py index cff0d0cca..6bf15aa26 100644 --- a/unittests/darwintests.py +++ b/unittests/darwintests.py @@ -148,4 +148,3 @@ class DarwinTests(BasePlatformTests): testdir = os.path.join(self.objcpp_test_dir, '1 simple') self.init(testdir) self.assertIn('-std=c++14', self.get_compdb()[0]['command']) - diff --git a/unittests/datatests.py b/unittests/datatests.py index f8d20ef58..6f4f4215e 100644 --- a/unittests/datatests.py +++ b/unittests/datatests.py @@ -269,4 +269,3 @@ class DataTests(unittest.TestCase): errors += [i[0]] self.assertListEqual(errors, [], err_msg + 'Files were changed') - diff --git a/unittests/failuretests.py b/unittests/failuretests.py index fd485fa3f..b5ecf3776 100644 --- a/unittests/failuretests.py +++ b/unittests/failuretests.py @@ -390,4 +390,3 @@ class FailureTests(BasePlatformTests): def test_error_func(self): self.assertMesonRaises("error('a', 'b', ['c', ['d', {'e': 'f'}]], 'g')", r"Problem encountered: a b \['c', \['d', {'e' : 'f'}\]\] g") - diff --git a/unittests/linuxcrosstests.py b/unittests/linuxcrosstests.py index 5916a9019..b3eecc836 100644 --- a/unittests/linuxcrosstests.py +++ b/unittests/linuxcrosstests.py @@ -190,4 +190,3 @@ class LinuxCrossMingwTests(BaseLinuxCrossTests): '-Dbuild.pkg_config_path=' + os.path.join(testdir, 'build_extra_path'), '-Dpkg_config_path=' + os.path.join(testdir, 'host_extra_path'), ]) - diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py index d3067bbf5..a86c3dc1e 100644 --- a/unittests/linuxliketests.py +++ b/unittests/linuxliketests.py @@ -1297,7 +1297,7 @@ class LinuxlikeTests(BasePlatformTests): out = self._run(['otool', '-L', f]) # Ensure that the otool output does not contain self.installdir self.assertNotRegex(out, self.installdir + '.*dylib ') - + @skipIfNoPkgconfig def test_link_arg_fullname(self): ''' @@ -1320,19 +1320,19 @@ class LinuxlikeTests(BasePlatformTests): 'PKG_CONFIG_PATH': os.path.join(installdir, self.libdir, 'pkgconfig')} testdir = os.path.join(self.unit_test_dir, '97 link full name','proguser') self.init(testdir,override_envvars=env) - + # test for link with full path with open(os.path.join(self.builddir, 'build.ninja'), encoding='utf-8') as bfile: for line in bfile: if 'build dprovidertest:' in line: self.assertIn('/libtestprovider.a', line) - + if is_osx(): # macOS's ld do not supports `--whole-archive`, skip build & run return - + self.build(override_envvars=env) - + # skip test if pkg-config is too old. # before v0.28, Libs flags like -Wl will not kept in context order with -l flags. # see https://gitlab.freedesktop.org/pkg-config/pkg-config/-/blob/master/NEWS @@ -1689,4 +1689,3 @@ class LinuxlikeTests(BasePlatformTests): obj_files = p.stdout.strip().split('\n') self.assertEqual(len(obj_files), 1) self.assertTrue(obj_files[0].endswith('-prelink.o')) - diff --git a/unittests/machinefiletests.py b/unittests/machinefiletests.py index 7022c0af4..0a756b572 100644 --- a/unittests/machinefiletests.py +++ b/unittests/machinefiletests.py @@ -933,4 +933,3 @@ class CrossFileTests(BasePlatformTests): break else: self.fail('Did not find expected option.') - diff --git a/unittests/pythontests.py b/unittests/pythontests.py index 7a709f008..c8efbdd3b 100644 --- a/unittests/pythontests.py +++ b/unittests/pythontests.py @@ -80,4 +80,3 @@ class PythonTests(BasePlatformTests): with self.assertRaises(unittest.SkipTest): self.init(testdir, extra_args=['-Dpython=dir']) self.wipe() - diff --git a/unittests/rewritetests.py b/unittests/rewritetests.py index 72704bb92..f03de0aa9 100644 --- a/unittests/rewritetests.py +++ b/unittests/rewritetests.py @@ -345,4 +345,3 @@ class RewriterTests(BasePlatformTests): } } self.assertDictEqual(out, expected) - diff --git a/unittests/subprojectscommandtests.py b/unittests/subprojectscommandtests.py index e2aebfcfd..edb8da62b 100644 --- a/unittests/subprojectscommandtests.py +++ b/unittests/subprojectscommandtests.py @@ -284,4 +284,3 @@ class SubprojectsCommandTests(BasePlatformTests): self.assertFalse(Path(self.subprojects_dir / 'sub_file').exists()) self.assertFalse(Path(self.subprojects_dir / 'sub_git').exists()) self.assertFalse(Path(self.subprojects_dir / 'redirect.wrap').exists()) - diff --git a/unittests/taptests.py b/unittests/taptests.py index 0d8d4a634..54946cff2 100644 --- a/unittests/taptests.py +++ b/unittests/taptests.py @@ -289,4 +289,3 @@ class TAPParserTests(unittest.TestCase): self.assert_error(events) self.assert_test(events, number=2, name='', result=TestResult.FAIL) self.assert_last(events) -