From nobody Sat Feb 7 05:37:31 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1653865300; cv=none; d=zohomail.com; s=zohoarc; b=dKpHYyO3Cm88XWnkVL2TkdKXxrtvs1ZIvEhqnbQo+It5f3T5dl73nJ7EDFQWE/MTTiwXtwsYB2wYCcInxMI4fMDTSdripddjT1EkEcZHAsc/ShUGrLtJq+bvXgDpfyMUM2kzUv5vStMuwrNsQXRCYffW7D9JEdx0DW3lCmhpJNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653865300; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u0DbRGMr63goT3DSBSa6lrHxSumvKxGwUlDqjMNCLcg=; b=Jzfv54zckSWlRJKsqVNLSrazi1JiKEzeJK4/XgXs4LdW0rBuirptWL2XSymsHJUwV9Wun9QmFm+r/0TSupFhHlx1W6xt2wLifMPLTogPotKFWz8gSQj9tS1+hkjz78rSmZMPk+DpZFKYvR2CxO9ettamOCf05EL1nHbs58ol7Rg= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1653865300946540.1760844009051; Sun, 29 May 2022 16:01:40 -0700 (PDT) Received: from localhost ([::1]:42494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvRul-0005zZ-VX for importer@patchew.org; Sun, 29 May 2022 19:01:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60090) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvRlU-0006t8-E2 for qemu-devel@nongnu.org; Sun, 29 May 2022 18:52:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvRlS-0002Bc-2r for qemu-devel@nongnu.org; Sun, 29 May 2022 18:52:04 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-582-26_ddzLoP8WoujOUO5jvrg-1; Sun, 29 May 2022 18:51:54 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 56BE9101A54E; Sun, 29 May 2022 22:51:54 +0000 (UTC) Received: from localhost (unknown [10.39.192.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 06B102166B26; Sun, 29 May 2022 22:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653864721; 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: in-reply-to:in-reply-to:references:references; bh=u0DbRGMr63goT3DSBSa6lrHxSumvKxGwUlDqjMNCLcg=; b=Vb0/xAwk2RqbY0mxGe+sezASX6bODFTSAstiqYNUmBsEeSL1DDvR7TngIKo16EynSJ/e+M zJY6K9gyheXdC72mIK08jwkRMFJUaXCwhLJoXuJ5s3dq+h0tRurU0VegXomDRdTG1wrw5y fMnsJ6RxDLMPUSIGzxitMKJJPba7KdY= X-MC-Unique: 26_ddzLoP8WoujOUO5jvrg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Konstantin Kostiuk , Michael Roth , richard.henderson@linaro.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file Date: Mon, 30 May 2022 00:51:32 +0200 Message-Id: <20220529225137.232359-11-marcandre.lureau@redhat.com> In-Reply-To: <20220529225137.232359-1-marcandre.lureau@redhat.com> References: <20220529225137.232359-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653865302977100001 From: Marc-Andr=C3=A9 Lureau This a more accurate way to lookup the test data, and will allow to move the test in a subproject. Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Konstantin Kostiuk Message-Id: <20220525144140.591926-11-marcandre.lureau@redhat.com> --- tests/unit/test-qga.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/unit/test-qga.c b/tests/unit/test-qga.c index d6df1ee92e..ab0b12a2dd 100644 --- a/tests/unit/test-qga.c +++ b/tests/unit/test-qga.c @@ -914,15 +914,14 @@ static void test_qga_guest_get_osinfo(gconstpointer d= ata) { TestFixture fixture; const gchar *str; - gchar *cwd, *env[2]; - QDict *ret, *val; + QDict *ret =3D NULL; + char *env[2]; + QDict *val; =20 - cwd =3D g_get_current_dir(); env[0] =3D g_strdup_printf( - "QGA_OS_RELEASE=3D%s%ctests%cdata%ctest-qga-os-release", - cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_DIR_SEPARATOR); + "QGA_OS_RELEASE=3D%s%c..%cdata%ctest-qga-os-release", + g_test_get_dir(G_TEST_DIST), G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_D= IR_SEPARATOR); env[1] =3D NULL; - g_free(cwd); fixture_setup(&fixture, NULL, env); =20 ret =3D qmp_fd(fixture.fd, "{'execute': 'guest-get-osinfo'}"); --=20 2.36.1