From f5072e23d923cf4c3d656fa7948628bc4d2abf45 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Fri, 12 Jan 2024 10:23:01 -0500 Subject: [PATCH] [meson] replace deprecated meson.build_root() use --- tests/meson.build | 2 +- tests/prepare.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 963688407..9fa4c83ae 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -26,7 +26,7 @@ if target_machine.system() != 'windows' env = environment() env.set('srcdir', meson.current_source_dir()) -env.set('top_builddir', meson.build_root()) +env.set('top_builddir', meson.current_build_dir() + '/..') tests = [ 'request.t', diff --git a/tests/prepare.sh b/tests/prepare.sh index 4cb453bf6..2e92ecd00 100755 --- a/tests/prepare.sh +++ b/tests/prepare.sh @@ -9,6 +9,7 @@ fi if test "x${top_builddir}" = "x"; then top_builddir=.. fi +top_builddir=${top_builddir%/tests/..} echo "Testing in build directory: '${top_builddir}' and cwd: '$(pwd)'"