From nobody Sat Apr 11 21:29:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773063436; cv=none; d=zohomail.com; s=zohoarc; b=WeTgAh9umnuHfETPmRgsyoxSlNX3e+LOXZUYMBacucZ26dT4vGNrxB1OqYBNnjWSfGnubL+RkLSa49zbfum7EE00BoYPqEStMxlsk69YPnwW6LxFQwvLUTT6QnOKwnvDrDJoqhfDpGoHXzycehc0oq0zJMPFf09n5RXJ9oeJVIg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773063436; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=httT+4K8tYibhwm0fXVvzC4IiCbaV5h+BQqL+XadykI=; b=POaQvkh8KasNl2q+8cn1vdMjBCIJs6ETm3CEhgLukIY6ydPlyfclfIxXJEFNmi6f7u01qM2dbeWos2Ck7ublf0R12/INFTN9OMrp4Ewq1oRfM/ajjf7u77jeOCwCdKF/OgM8nK3+xMXLwK7eS7qgw/sCaoSLvVeBdxJIm87afNw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773063436070104.72976350689044; Mon, 9 Mar 2026 06:37:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vzan7-00089G-AD; Mon, 09 Mar 2026 09:37:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzams-00087l-8W for qemu-devel@nongnu.org; Mon, 09 Mar 2026 09:36:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vzamq-0004gI-Fc for qemu-devel@nongnu.org; Mon, 09 Mar 2026 09:36:46 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-igJpzPqNOQmURiqu9QbmVg-1; Mon, 09 Mar 2026 09:36:38 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2F1441956095; Mon, 9 Mar 2026 13:36:37 +0000 (UTC) Received: from toolbx.redhat.com (unknown [10.44.33.95]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1C5111800594; Mon, 9 Mar 2026 13:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773063403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=httT+4K8tYibhwm0fXVvzC4IiCbaV5h+BQqL+XadykI=; b=TtoxKGjW1giwhHlPzpm6L3UX0YN0angDNU5PS5IdqCk/6EC1wYNIBd6uJoqN6WRF5qGZst 8OoUobKzfx8Rig1ZZ1153CyqjnQD/9QbVgpRdh8SvsbYGHZ3TPI5o5ujp+2PFu77CN1/8g uPtCRpxsxAHgxHNxasqzxK1264Uh5eg= X-MC-Unique: igJpzPqNOQmURiqu9QbmVg-1 X-Mimecast-MFC-AGG-ID: igJpzPqNOQmURiqu9QbmVg_1773063397 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell Subject: [PATCH] tests/functional: fix log placement when run directly Date: Mon, 9 Mar 2026 13:36:33 +0000 Message-ID: <20260309133633.3619913-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773063437797158500 When running functional tests directly there are some heuristics to figure out where the build directory lives, along with the possibility to override the logic by setting the QEMU_BUILD_DIR env variable. This env var is set as part of the test env when run via Meson but not when run directly. A particular flaw with the currently logic is that it silently uses the wrong location when the build directory is a sub-dir under "./build", which is a common usage scenario for some devs. With the recent introduction of the 'run' script, we now have the MESON_BUILD_DIR env variable set unconditionally, so we can rely on that from the functional tests to get the correct location in all scenarios. Reported-by: Peter Maydell Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/functional/meson.build | 2 +- tests/functional/qemu_test/config.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional/meson.build b/tests/functional/meson.build index b979cff2b9..d34aefa8b0 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -74,7 +74,7 @@ foreach speed : ['quick', 'thorough'] test_deps +=3D [qemu_img] endif test_env.set('QEMU_TEST_QEMU_BINARY', test_emulator.full_path()) - test_env.set('QEMU_BUILD_ROOT', meson.project_build_root()) + test_env.set('MESON_BUILD_ROOT', meson.project_build_root()) test_env.set('PYTHONPATH', meson.project_source_root() / 'python:' + meson.current_source_dir()) =20 diff --git a/tests/functional/qemu_test/config.py b/tests/functional/qemu_t= est/config.py index 6d4c9c3ce1..0192027233 100644 --- a/tests/functional/qemu_test/config.py +++ b/tests/functional/qemu_test/config.py @@ -21,7 +21,7 @@ def _source_dir(): return Path(__file__).parent.parent.parent.parent =20 def _build_dir(): - root =3D os.getenv('QEMU_BUILD_ROOT') + root =3D os.getenv('MESON_BUILD_ROOT') if root is not None: return Path(root) # Makefile.mtest only exists in build dir, so if it is available, use = CWD @@ -32,7 +32,7 @@ def _build_dir(): if os.path.exists(root): return Path(root) =20 - raise Exception("Cannot identify build dir, set QEMU_BUILD_ROOT") + raise Exception("Cannot identify build dir, set MESON_BUILD_ROOT") =20 BUILD_DIR =3D _build_dir() =20 --=20 2.53.0