From nobody Sat Apr 20 12:51:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617299142; cv=none; d=zohomail.com; s=zohoarc; b=RNmtz3poDVhjS5m0yrv9UTxG3XHrTioImm8P3JjuYJC1BjDIM9tZrpkf68VwhOWWZJFxjMr7+9ZGLqG7SYJlN4wkuXjq+6++LcQUAMR3mLqG8GNnyM8WRoQ1DAWM/8Q33ElUo18Sk4tIvjt5jkXUcMNGpj7XYZU4eXPw9miZW0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617299142; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Hqcd5i/t8hp98dHeFkDGxcAm+u3JXUXNx5rI2lTx7oc=; b=IRQPxriSYWnW3Rx06LMZMQuu380oGD8ZZw+e+u/uPNZarOQ2cbkvUt4LYlhcvR6V2iky6MEaO1pamaEU9H2HOvASBoDw+4RB+IS9YW1zt+AHt9i5hKchQVmQkwaaSB+eTiRhsieq1yfg1n20Y3aVX/1jFEninz0yTvPHI28vHe0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 161729914282342.797506506750324; Thu, 1 Apr 2021 10:45:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-508-U1SMLW9kO-6bLThYS6fymQ-1; Thu, 01 Apr 2021 13:45:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 007E9107ACCD; Thu, 1 Apr 2021 17:45:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 56FCB5044A; Thu, 1 Apr 2021 17:45:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9122A4BB7C; Thu, 1 Apr 2021 17:45:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 131HjSXR018270 for ; Thu, 1 Apr 2021 13:45:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id D383721CAC6D; Thu, 1 Apr 2021 17:45:28 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CAB3221CAC6C for ; Thu, 1 Apr 2021 17:45:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4E702800B23 for ; Thu, 1 Apr 2021 17:45:26 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [62.140.7.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-43-tdsX347UMZ2xhS2trG1X2g-1; Thu, 01 Apr 2021 13:45:24 -0400 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2052.outbound.protection.outlook.com [104.47.4.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-14-TndRiTWsMS6r9FDkVLNQVg-1; Thu, 01 Apr 2021 19:45:21 +0200 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM4PR0401MB2401.eurprd04.prod.outlook.com (2603:10a6:200:47::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.30; Thu, 1 Apr 2021 17:45:20 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::8532:12af:9c2:66ca]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::8532:12af:9c2:66ca%7]) with mapi id 15.20.3999.028; Thu, 1 Apr 2021 17:45:20 +0000 Received: from linux-tbji.devlab.prv.suse.com (75.169.51.246) by AM0PR02CA0078.eurprd02.prod.outlook.com (2603:10a6:208:154::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.26 via Frontend Transport; Thu, 1 Apr 2021 17:45:19 +0000 X-MC-Unique: U1SMLW9kO-6bLThYS6fymQ-1 X-MC-Unique: tdsX347UMZ2xhS2trG1X2g-1 X-MC-Unique: TndRiTWsMS6r9FDkVLNQVg-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V2] tests: Fix qemuxml2xmltest with audio driver defined in env Date: Thu, 1 Apr 2021 11:44:59 -0600 Message-ID: <20210401174459.9793-1-jfehlig@suse.com> X-Originating-IP: [75.169.51.246] X-ClientProxiedBy: AM0PR02CA0078.eurprd02.prod.outlook.com (2603:10a6:208:154::19) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d2353c9-74d8-460c-1adc-08d8f535eb20 X-MS-TrafficTypeDiagnostic: AM4PR0401MB2401: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: 2GeEgI6vPwldm32B5rFjvdNYqieVG2kNJr5YgIXfccvFhi1nwsziROJ5DEwqMqh1tbgNd51BeL+RB3jKkHlEJ8w3Rq6/ndrMWHVFOvxlU+2IUaebk+tZp/VP2vjg7nGSA/DOjjO1oor+8NXwpFgJH3aU496unGLnrR21KAKtUZ1fetqJ5qv/c5GnaERmVZ7StXNzjHYUotSrj7A4zsOeT9ajD40o87en/7Ag/hgq6L3VL3W+OG2XgTj963SJqmHIKQTwMWhmxAvLYC0fVIfmQfFJRdrCdn9p6pTJUFlz8/AF6DUPtDrzrDJ/ffW9IDmmkFQLrOUe25NH41HdstY3KmQgyxt2d2qXrJMmod5+tluaXaBCOwGE/uBaHqte3p76JhrgPZYTaWi3d17qZ1i3ecp1rAYlkheg+RG2+TZhSCWOvK4gjRiRHmL4pe65wGYmoAKOLIaK0Zc8ZoWMEWRW0fmVY4oXwAC0SArBp/mUwi9c6so5sDpf2cJl8oiYIl4mfgp+A5aVZHTl/j7RftcipwWi6jAxMxE0SMkKh6rN2carzj7XFVhUrde6KHFFRYKo+61BSm0RcpzEaQ9GC1cJXipoLUsxyTncQOj6xhsqcgS607SUMumgkoicp01Ay7ztFw6tBGMDFYnvb/GsZge4uA3Jep+yknfpAugVAonZUHU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(376002)(39860400002)(136003)(346002)(396003)(6916009)(2906002)(66556008)(86362001)(52116002)(36756003)(478600001)(66946007)(4326008)(8936002)(8676002)(7696005)(186003)(26005)(5660300002)(2616005)(6666004)(956004)(38100700001)(316002)(66476007)(6486002)(107886003)(16526019)(1076003)(83380400001); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?WNMTx38bvqE+DeuQFyjY3bXVf0gcvUj0ectR6bT8FadDZdDZ1dUUzt86C4oN?= =?us-ascii?Q?hjayQh50WnQri93EfPmEAWQZiJ7bF2orp2RX0zJWEyTMBzzQdJbKZk8CN4D3?= =?us-ascii?Q?CV4OyrAGtILPwPj5g8YLLF+4rPwUCRGY+4+8flVBIQKU09l8KVDiCuzvi6hX?= =?us-ascii?Q?ELY/GJ/gleobZo/ixwEYT2lfkhD+nA2jUA8jpvx3g3MoFHjfvZEbQTfuG+ss?= =?us-ascii?Q?GSKoRTPH4G/IfaKfD3I6XgBAk14tsJFXnVt1NuiksKSVsix2e+s7hx0poStb?= =?us-ascii?Q?B4iiUWYrknkbogJ+tf+2szKXdltj0NacY0NypU+ZAR+az6ZWQNGyKT0MHuaO?= =?us-ascii?Q?ueHw33szkhypNSRLMg2Sm/b6kel524lbk+p4jsT8nQs03inOco/7fepn5q2n?= =?us-ascii?Q?DA9fGxWKIHZTH87xjDTYIPsStK2DOcUOiUQh3AZADm8kkVtRnDWn3ITM1REp?= =?us-ascii?Q?785H9JOD4pA/6kG/41/KZTBYauKyL5yesIxCtNwnwoOsdn+k9V39yY9C97mz?= =?us-ascii?Q?OMFQJD/7wa9kC4eijlf/kpARLLPOIKXZ3h6cVGm9S20m/lpxMXozb8MgSsk8?= =?us-ascii?Q?3a86YC0ujKOEmrrRHEcqXeUFuTwWtfVAf2tlWWpBEVpKDh6ChUnp8CHgNZHu?= =?us-ascii?Q?I2Z4tmBWmusnQDXzRyUwzT+NU9qlose5u00eA+4f8c4DYhJTXX7841Y5HYEn?= =?us-ascii?Q?4JwVt8rDMx5QeJDsct7qksy/V7auZ7GmMvxIS+jvrbM3kNb/vrUyroans0nn?= =?us-ascii?Q?rKCUJdzwpbagaFjiZa5UJZJeJby+OTiPgzsoIlWpCqhBWIWr1mCo2POrAPVk?= =?us-ascii?Q?4/YqXTIZK6nyvaQL5wZyvktbgQuib27SaEgja1vPzjbJ8bWdd1u+P70Np9gN?= =?us-ascii?Q?yyYYjghuB6uwnnFFnGDPlAGwFS8pbnaqoq4GS9YogaiSxjZp+OfA7QCoLm2N?= =?us-ascii?Q?WsQ4QmIpqsWYhlLuDuUJlDS5fund3z9/2J/hQA33DxmMyuFmcn6hUBjcpoHo?= =?us-ascii?Q?RgC+ElFz9oFMVEWWuCeBQ80H5WNhHb+sJI7yIuEUrffmR9U6YgxdBaZ/FQVz?= =?us-ascii?Q?zpFU5KBatYt+Oj8NPmCB/1Qu2Yfpk9mw/BAaPXDySjayibAypxpNH77t+SA9?= =?us-ascii?Q?gVIceU5jg2ZCKvDOVoSkJF3i+Rr06DXhfIjPEHGxTx0PRI+n40pTxyCQrlEW?= =?us-ascii?Q?CmRI5D1d9YLpMHgsfTD05QpZfQQpMsOJleJ/LcMiS/5OLCM+87FThCc9zZAW?= =?us-ascii?Q?gadMfKY1ptWgq4dtEu0X0BoqWeEtRqqi4xkPDxHJKAKxnC6BL6uRamxOiQQG?= =?us-ascii?Q?bx9uYEZECsa/ycHocsKbgWZe?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d2353c9-74d8-460c-1adc-08d8f535eb20 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Apr 2021 17:45:20.2385 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C3PmbSXIw6B/VFm5LYW6rMFBOet+soIRNk0u7dACP+6BRwFmeRhZqpU2f9bm5tdRJOJDa9xTxutg3f9ShD/png== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0401MB2401 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 131HjSXR018270 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If QEMU_AUDIO_DRV is defined in the build host environment, several tests in qemuxml2xmltest fail. $ env | grep -i audio AUDIODRIVER=3Dpulseaudio QEMU_AUDIO_DRV=3Dpa SDL_AUDIODRIVER=3Dpulse An example test failure with the above environment 907) QEMU XML-2-XML-active video-virtio-gpu-sdl-gl In 'libvirt/tests/qemuxml2xmloutdata/video-virtio-gpu-sdl-gl.xml': Offset 1244 Expect [v] Actual [audio id=3D'1' type=3D'pulseaudio'/> Reviewed-by: Daniel P. Berrang=C3=A9 --- v2: Also scrub SDL_AUDIODRIVER tests/qemuxml2xmltest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 137f1871af..823dd40f50 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -198,6 +198,8 @@ mymain(void) * using ADD_ENV_COPY, otherwise these tests may fail due to unexpected * values for these envvars */ g_setenv("PATH", "/bin", TRUE); + g_unsetenv("QEMU_AUDIO_DRV"); + g_unsetenv("SDL_AUDIODRIVER"); =20 DO_TEST("minimal", NONE); DO_TEST_CAPS_LATEST("genid"); --=20 2.30.1