From 5edbc0acd717bd3bd4268c5d3a43fb07d6593f54 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 19 Feb 2021 21:23:19 -0800 Subject: tests/rust: Add rust case linking to zlib dependency Reworks: * Add MESON_SKIP_TEST error for darwin from polyglot test * Remove dependencies from executable Dylan's changes: * Add support for both static and shared testing * Test with pkg-config, cmake, and system * reformat to meson's style Co-authored-by: Dylan Baker --- .../13 external c dependencies/c_accessing_zlib.c | 10 ++++++++++ .../rust/13 external c dependencies/meson.build | 23 ++++++++++++++++++++++ .../13 external c dependencies/meson_options.txt | 2 ++ test cases/rust/13 external c dependencies/prog.rs | 9 +++++++++ .../rust/13 external c dependencies/test.json | 15 ++++++++++++++ 5 files changed, 59 insertions(+) create mode 100644 test cases/rust/13 external c dependencies/c_accessing_zlib.c create mode 100644 test cases/rust/13 external c dependencies/meson.build create mode 100644 test cases/rust/13 external c dependencies/meson_options.txt create mode 100644 test cases/rust/13 external c dependencies/prog.rs create mode 100644 test cases/rust/13 external c dependencies/test.json diff --git a/test cases/rust/13 external c dependencies/c_accessing_zlib.c b/test cases/rust/13 external c dependencies/c_accessing_zlib.c new file mode 100644 index 000000000..358b98998 --- /dev/null +++ b/test cases/rust/13 external c dependencies/c_accessing_zlib.c @@ -0,0 +1,10 @@ +#include +#include +#include + +void c_accessing_zlib(void) { + struct z_stream_s zstream; + printf("Hello from C!\n"); + memset(&zstream, 0, sizeof(zstream)); + inflateInit(&zstream); +} diff --git a/test cases/rust/13 external c dependencies/meson.build b/test cases/rust/13 external c dependencies/meson.build new file mode 100644 index 000000000..e5caf70cf --- /dev/null +++ b/test cases/rust/13 external c dependencies/meson.build @@ -0,0 +1,23 @@ +project('rust linking to c using dependency', 'c', 'rust') + +if host_machine.system() == 'darwin' + error('MESON_SKIP_TEST: doesnt work right on macos, please fix!') +endif + +dep_zlib = dependency('zlib', static : get_option('static'), method : get_option('method'), required : false) +if not dep_zlib.found() + error('MESON_SKIP_TEST: Could not find a @0@ zlib'.format(get_option('static') ? 'static' : 'shared')) +endif + +l = static_library( + 'c_accessing_zlib', + 'c_accessing_zlib.c', + dependencies: [dep_zlib], +) + +e = executable( + 'prog', 'prog.rs', + link_with : l, +) + +test('cdepstest', e) diff --git a/test cases/rust/13 external c dependencies/meson_options.txt b/test cases/rust/13 external c dependencies/meson_options.txt new file mode 100644 index 000000000..f501348b6 --- /dev/null +++ b/test cases/rust/13 external c dependencies/meson_options.txt @@ -0,0 +1,2 @@ +option('static', type : 'boolean') +option('method', type : 'string') diff --git a/test cases/rust/13 external c dependencies/prog.rs b/test cases/rust/13 external c dependencies/prog.rs new file mode 100644 index 000000000..b30ec24fb --- /dev/null +++ b/test cases/rust/13 external c dependencies/prog.rs @@ -0,0 +1,9 @@ +extern "C" { + fn c_accessing_zlib(); +} + +fn main() { + unsafe { + c_accessing_zlib(); + } +} diff --git a/test cases/rust/13 external c dependencies/test.json b/test cases/rust/13 external c dependencies/test.json new file mode 100644 index 000000000..ad0e79a6e --- /dev/null +++ b/test cases/rust/13 external c dependencies/test.json @@ -0,0 +1,15 @@ +{ + "matrix": { + "options": { + "static": [ + { "val": true }, + { "val": false } + ], + "method": [ + { "val": "pkg-config" }, + { "val": "cmake" }, + { "val": "system" } + ] + } + } +} -- cgit v1.2.3