[criterion] Adapt JSON traversal to work with later versions of meson #31
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… meson 1.5.1 The plugin was originally written using meson version <1.0. At some point meson started adding linker information to "target_sources" in the output generated from the command: meson introspect --targets build This breaks the code which this commit attempts to fix. Tested on both meson 0.64.1 and meson 1.5.1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The criterion adapter uses
meson introspect --targetsto map the currently open buffer with a test executable. The output of this command has changed with later versions of meson which breaks this adapter in its current form when traversing the decoded json.Specifically the
target_sourcesentry can contain linker information on newer versions whereas older versions does not include that. The adapter was originally written using meson version 0.64.1 where this issue went unnoticed.These changes has been tested with meson version 0.64.1 and 1.5.1.
Example output with meson 1.5.1
[ { "name": "hello", "id": "hello@exe", "type": "executable", "defined_in": "/home/oyvind/hello/meson.build", "filename": [ "/home/oyvind/hello/build/hello" ], "target_sources": [ { "language": "c", "compiler": [ "cc" ], "parameters": [ "-I/home/oyvind/hello/build/hello.p", "-I/home/oyvind/hello/build", "-I/home/oyvind/hello", "-fdiagnostics-color=always", "-D_FILE_OFFSET_BITS=64", "-Wall", "-Winvalid-pch", "-Wextra", "-Wpedantic", "-O0", "-g" ], "sources": [ "/home/oyvind/hello/hello.c" ], "generated_sources": [], "unity_sources": [] }, { "linker": [ "cc" ], "parameters": [ "-Wl,--as-needed", "-Wl,--no-undefined" ] } ], "extra_files": [], "subproject": null, "dependencies": [], "depends": [], "win_subsystem": "console", "installed": true, "install_filename": [ "/usr/local/bin/hello" ] } ]Example output with meson 0.64.1
[ { "name": "hello", "id": "hello@exe", "type": "executable", "defined_in": "/home/oyvind/hello/meson.build", "filename": [ "/home/oyvind/hello/build/hello" ], "build_by_default": true, "target_sources": [ { "language": "c", "compiler": [ "cc" ], "parameters": [ "-I/home/oyvind/hello/build/hello.p", "-I/home/oyvind/hello/build", "-I/home/oyvind/hello", "-fdiagnostics-color=always", "-D_FILE_OFFSET_BITS=64", "-Wall", "-Winvalid-pch", "-Wextra", "-Wpedantic", "-O0", "-g" ], "sources": [ "/home/oyvind/hello/hello.c" ], "generated_sources": [] } ], "extra_files": [], "subproject": null, "installed": true, "install_filename": [ "/usr/local/bin/hello" ] } ]