From 82ad67d4855b8bc27e5ab34365c25285a920f066 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Sat, 19 Nov 2022 19:01:30 +0100 Subject: [PATCH] Use correct path in setup_schema when running via meson --- src/main.rs | 3 ++- src/meson.build | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 33bd03178..01c900c75 100644 --- a/src/main.rs +++ b/src/main.rs @@ -85,7 +85,8 @@ mod test { // Run once before tests are executed. #[ctor] fn setup_schema() { - let schema_dir = concat!(env!("CARGO_MANIFEST_DIR"), "/data"); + let schema_dir = &env::var("GSETTINGS_SCHEMA_DIR") + .unwrap_or(concat!(env!("CARGO_MANIFEST_DIR"), "/data").into()); let output = Command::new("glib-compile-schemas") .arg(schema_dir) diff --git a/src/meson.build b/src/meson.build index f012df9bf..7237362e3 100644 --- a/src/meson.build +++ b/src/meson.build @@ -69,6 +69,7 @@ test( env: [ 'RUST_BACKTRACE=1', 'CARGO_HOME=@0@'.format(cargo_home), + 'GSETTINGS_SCHEMA_DIR=@0@/data'.format(meson.project_build_root()), 'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm14/bin:/usr/lib/sdk/rust-stable/bin', # TODO Remove llvm14 once removed in manifest ], timeout: 300, # give cargo more time