From nobody Fri May 3 05:11:13 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600857432; cv=none; d=zohomail.com; s=zohoarc; b=bwXmhzHX8RvPYVQD3LiUXRs5sQ0W79+FBb1X4vBv45Y2eK9IqjVe8/994E2njgCouRAimbYtGP2dnEfRHcU6nwVFbhzt+jnJauneyCFU56972do3HbSPct6uwkmxVy1lw+lCfZFzL2XyWTupmAgTCkDHMd4V6E13kapravnn8bc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600857432; h=Content-Type:Content-Transfer-Encoding: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=7FgoUs92HGUTEfDbJY2DMMvY1dwh3xdm+kf/U2rrSMM=; b=IjFO64MpFf9UbqcEmKGH5aT2T2srrnofYwJOh//5kZkpAwfJZIyrvbZ9iVQDflf3/n3hO7gqWGV0N5JBqAtz4ITuad7qs3F86fFoYedYvRCY1rO2kAzM3zwpYUIPXQUZvpRXbdksjhyMsf7sNBhcgloNJwGvdyH8CX3SqWeHSB8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) 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 1600857432139480.3519592016934; Wed, 23 Sep 2020 03:37:12 -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-94-UpvLSeTnP4eIGvSBofw7Zw-1; Wed, 23 Sep 2020 06:37:08 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40EFF107465F; Wed, 23 Sep 2020 10:37:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E627755777; Wed, 23 Sep 2020 10:37:02 +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 9A1FB181A06C; Wed, 23 Sep 2020 10:37:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NAawar019810 for ; Wed, 23 Sep 2020 06:36:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3346D5C26B; Wed, 23 Sep 2020 10:36:58 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABA325C225 for ; Wed, 23 Sep 2020 10:36:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600857430; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7FgoUs92HGUTEfDbJY2DMMvY1dwh3xdm+kf/U2rrSMM=; b=Qpqe7QZuKasdaK2+YQvZf2rk6CGYMQFNQzNV3WfZ+Twy9uoM3Ov2wgdb7RKAsFE9M+p6u3 L8/t2G1xjuW7N2Dl6dHUyvalY2x8aPscfa4g/gfOZIrtr4vonHCl37B/mEVt+rnEvEWhbZ g/xGM7awJ5aOX9JzLN/OWW1W9W8Gkmg= X-MC-Unique: UpvLSeTnP4eIGvSBofw7Zw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 1/2] esx: separate header and source file generation Date: Wed, 23 Sep 2020 12:36:50 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.15 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Invoke the generator twice and introduce separate meson targets for headers and C sources. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- scripts/esx_vi_generator.py | 161 ++++++++++++++++++++---------------- src/esx/meson.build | 29 +++++-- 2 files changed, 114 insertions(+), 76 deletions(-) diff --git a/scripts/esx_vi_generator.py b/scripts/esx_vi_generator.py index 7929e1e682..c9bd8f4920 100755 --- a/scripts/esx_vi_generator.py +++ b/scripts/esx_vi_generator.py @@ -1331,24 +1331,27 @@ additional_object_features =3D { =20 removed_object_features =3D {} =20 -if len(sys.argv) !=3D 3: - report_error("usage: %s srcdir builddir" % sys.argv[0]) +if len(sys.argv) !=3D 4: + report_error("usage: %s srcdir builddir header" % sys.argv[0]) =20 input_filename =3D os.path.join(sys.argv[1], "esx/esx_vi_generator.input") output_dirname =3D os.path.join(sys.argv[2], "esx") +header =3D sys.argv[3] =3D=3D "header" =20 =20 -types_typedef =3D open_file(os.path.join(output_dirname, "esx_vi_types.gen= erated.typedef")) -types_typeenum =3D open_file(os.path.join(output_dirname, "esx_vi_types.ge= nerated.typeenum")) -types_typetostring =3D open_file(os.path.join(output_dirname, "esx_vi_type= s.generated.typetostring")) -types_typefromstring =3D open_file(os.path.join(output_dirname, "esx_vi_ty= pes.generated.typefromstring")) -types_header =3D open_file(os.path.join(output_dirname, "esx_vi_types.gene= rated.h")) -types_source =3D open_file(os.path.join(output_dirname, "esx_vi_types.gene= rated.c")) -methods_header =3D open_file(os.path.join(output_dirname, "esx_vi_methods.= generated.h")) -methods_source =3D open_file(os.path.join(output_dirname, "esx_vi_methods.= generated.c")) -methods_macro =3D open_file(os.path.join(output_dirname, "esx_vi_methods.g= enerated.macro")) -helpers_header =3D open_file(os.path.join(output_dirname, "esx_vi.generate= d.h")) -helpers_source =3D open_file(os.path.join(output_dirname, "esx_vi.generate= d.c")) +if header: + types_typedef =3D open_file(os.path.join(output_dirname, "esx_vi_types= .generated.typedef")) + types_typeenum =3D open_file(os.path.join(output_dirname, "esx_vi_type= s.generated.typeenum")) + types_header =3D open_file(os.path.join(output_dirname, "esx_vi_types.= generated.h")) + methods_header =3D open_file(os.path.join(output_dirname, "esx_vi_meth= ods.generated.h")) + helpers_header =3D open_file(os.path.join(output_dirname, "esx_vi.gene= rated.h")) +else: + types_typetostring =3D open_file(os.path.join(output_dirname, "esx_vi_= types.generated.typetostring")) + types_typefromstring =3D open_file(os.path.join(output_dirname, "esx_v= i_types.generated.typefromstring")) + types_source =3D open_file(os.path.join(output_dirname, "esx_vi_types.= generated.c")) + methods_macro =3D open_file(os.path.join(output_dirname, "esx_vi_metho= ds.generated.macro")) + methods_source =3D open_file(os.path.join(output_dirname, "esx_vi_meth= ods.generated.c")) + helpers_source =3D open_file(os.path.join(output_dirname, "esx_vi.gene= rated.c")) =20 =20 number =3D 0 @@ -1604,96 +1607,114 @@ for obj in managed_objects_by_name.values(): =20 notice =3D "/* Generated by esx_vi_generator.py */\n\n\n\n" =20 -types_typedef.write(notice) -types_typeenum.write(notice) -types_typetostring.write(notice) -types_typefromstring.write(notice) -types_header.write(notice) -types_source.write(notice) -methods_header.write(notice) -methods_source.write(notice) -methods_macro.write(notice) -helpers_header.write(notice) -helpers_source.write(notice) +if (header): + types_typedef.write(notice) + types_typeenum.write(notice) + types_header.write(notice) + methods_header.write(notice) + helpers_header.write(notice) +else: + types_typetostring.write(notice) + types_typefromstring.write(notice) + types_source.write(notice) + methods_macro.write(notice) + methods_source.write(notice) + helpers_source.write(notice) =20 =20 # output enums -types_typedef.write(separator + - " * VI Enums\n" + - " */\n\n") +if header: + types_typedef.write(separator + + " * VI Enums\n" + + " */\n\n") =20 names =3D sorted(enums_by_name.keys()) =20 for name in names: - types_typedef.write(enums_by_name[name].generate_typedef()) - types_typeenum.write(enums_by_name[name].generate_typeenum()) - types_typetostring.write(enums_by_name[name].generate_typetostring()) - types_typefromstring.write(enums_by_name[name].generate_typefromstring= ()) - types_header.write(enums_by_name[name].generate_header()) - types_source.write(enums_by_name[name].generate_source()) + if header: + types_typedef.write(enums_by_name[name].generate_typedef()) + types_typeenum.write(enums_by_name[name].generate_typeenum()) + types_header.write(enums_by_name[name].generate_header()) + else: + types_typetostring.write(enums_by_name[name].generate_typetostring= ()) + types_typefromstring.write(enums_by_name[name].generate_typefromst= ring()) + types_source.write(enums_by_name[name].generate_source()) =20 =20 # output objects -types_typedef.write("\n\n\n" + - separator + - " * VI Objects\n" + - " */\n\n") -types_typeenum.write("\n") -types_typetostring.write("\n") -types_typefromstring.write("\n") +if header: + types_typedef.write("\n\n\n" + + separator + + " * VI Objects\n" + + " */\n\n") + types_typeenum.write("\n") +else: + types_typetostring.write("\n") + types_typefromstring.write("\n") =20 names =3D sorted(objects_by_name.keys()) =20 for name in names: - types_typedef.write(objects_by_name[name].generate_typedef()) - types_typeenum.write(objects_by_name[name].generate_typeenum()) - types_typetostring.write(objects_by_name[name].generate_typetostring()) - types_typefromstring.write(objects_by_name[name].generate_typefromstri= ng()) - types_header.write(objects_by_name[name].generate_header()) - types_source.write(objects_by_name[name].generate_source()) + if header: + types_typedef.write(objects_by_name[name].generate_typedef()) + types_typeenum.write(objects_by_name[name].generate_typeenum()) + types_header.write(objects_by_name[name].generate_header()) + else: + types_typetostring.write(objects_by_name[name].generate_typetostri= ng()) + types_typefromstring.write(objects_by_name[name].generate_typefrom= string()) + types_source.write(objects_by_name[name].generate_source()) =20 =20 # output managed objects -types_typedef.write("\n\n\n" + - separator + - " * VI Managed Objects\n" + - " */\n\n") -types_typeenum.write("\n") -types_typetostring.write("\n") -types_typefromstring.write("\n") +if header: + types_typedef.write("\n\n\n" + + separator + + " * VI Managed Objects\n" + + " */\n\n") + types_typeenum.write("\n") +else: + types_typetostring.write("\n") + types_typefromstring.write("\n") =20 names =3D sorted(managed_objects_by_name.keys()) =20 for name in names: - types_typedef.write(managed_objects_by_name[name].generate_typedef()) - types_typeenum.write(managed_objects_by_name[name].generate_typeenum()) - types_typetostring.write(managed_objects_by_name[name].generate_typeto= string()) - types_typefromstring.write(managed_objects_by_name[name].generate_type= fromstring()) - types_header.write(managed_objects_by_name[name].generate_header()) - types_source.write(managed_objects_by_name[name].generate_source()) + if header: + types_typedef.write(managed_objects_by_name[name].generate_typedef= ()) + types_typeenum.write(managed_objects_by_name[name].generate_typeen= um()) + types_header.write(managed_objects_by_name[name].generate_header()) + else: + types_typetostring.write(managed_objects_by_name[name].generate_ty= petostring()) + types_typefromstring.write(managed_objects_by_name[name].generate_= typefromstring()) + types_source.write(managed_objects_by_name[name].generate_source()) =20 =20 # output methods names =3D sorted(methods_by_name.keys()) =20 for name in names: - methods_header.write(methods_by_name[name].generate_header()) - methods_source.write(methods_by_name[name].generate_source()) + if header: + methods_header.write(methods_by_name[name].generate_header()) + else: + methods_source.write(methods_by_name[name].generate_source()) =20 -names =3D list(autobind_names) -names.sort() +if not header: + names =3D list(autobind_names) + names.sort() =20 -for name in names: - string =3D aligned("#define ESX_VI__METHOD__PARAMETER__THIS__%s " % na= me, "\\\n", 78) - string +=3D " ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(ManagedO= bjectReference, \\\n" - string +=3D aligned("", "%s)\n\n\n\n" % name, 49) + for name in names: + string =3D aligned("#define ESX_VI__METHOD__PARAMETER__THIS__%s " = % name, "\\\n", 78) + string +=3D " ESX_VI__METHOD__PARAMETER__THIS_FROM_SERVICE(Mana= gedObjectReference, \\\n" + string +=3D aligned("", "%s)\n\n\n\n" % name, 49) =20 - methods_macro.write(string) + methods_macro.write(string) =20 =20 # output helpers names =3D sorted(managed_objects_by_name.keys()) =20 for name in names: - helpers_header.write(managed_objects_by_name[name].generate_helper_hea= der()) - helpers_source.write(managed_objects_by_name[name].generate_helper_sou= rce()) + if header: + helpers_header.write(managed_objects_by_name[name].generate_helper= _header()) + else: + helpers_source.write(managed_objects_by_name[name].generate_helper= _source()) diff --git a/src/esx/meson.build b/src/esx/meson.build index f2d59462fe..3e3d8591e5 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -12,21 +12,36 @@ esx_sources =3D [ 'esx_vi_types.c', ] =20 -esx_gen_sources =3D custom_target( - 'virtesxgen', +esx_gen_headers =3D custom_target( + 'virtesxgenheaders', input: [ 'esx_vi_generator.input', ], output: [ - 'esx_vi.generated.c', 'esx_vi.generated.h', - 'esx_vi_methods.generated.c', 'esx_vi_methods.generated.h', - 'esx_vi_methods.generated.macro', - 'esx_vi_types.generated.c', 'esx_vi_types.generated.h', 'esx_vi_types.generated.typedef', 'esx_vi_types.generated.typeenum', + ], + command: [ + meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), + meson.source_root() / 'src', + meson.build_root() / 'src', + 'header', + ], +) + +esx_gen_sources =3D custom_target( + 'virtesxgensources', + input: [ + 'esx_vi_generator.input', + ], + output: [ + 'esx_vi.generated.c', + 'esx_vi_methods.generated.macro', + 'esx_vi_methods.generated.c', + 'esx_vi_types.generated.c', 'esx_vi_types.generated.typefromstring', 'esx_vi_types.generated.typetostring', ], @@ -34,6 +49,7 @@ esx_gen_sources =3D custom_target( meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), meson.source_root() / 'src', meson.build_root() / 'src', + 'source', ], ) =20 @@ -42,6 +58,7 @@ if conf.has('WITH_ESX') 'virt_driver_esx', [ esx_sources, + esx_gen_headers[1], esx_gen_sources[1], ], dependencies: [ --=20 2.26.2 From nobody Fri May 3 05:11:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1600857436; cv=none; d=zohomail.com; s=zohoarc; b=eWeqPsjUfmBPP4C/5ctyAp9QC9bLtrY9yf0L+TKgtthlU/rgfJu5OxQaCdTwsRnsZK/DCAzleSDlF1CjJgkqsjBfRRhdFzZmIqdfk2uopCMNNZQhC+FKpPw2mNoME8PrCkQuhuKJ7V1S6f2pNhK2Wo2ssOi3NDcJ0TzxVtDlsvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600857436; h=Content-Type:Content-Transfer-Encoding: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=Ow4u1EnsZ482v06Qif1JERq9mZbV8ZEuMafVLwc7dSk=; b=WrWYjN6AI3MgkAcH2j6UQrNP90KrILt3+z3KWyQcO3QP3u/2OY/shwd1vaV5n1Ptns0nZdulEvgdwWiWN6OmsXguRSs9SDsbQ8igZRXkA6fvGQIyJoh6e8pILDItECOtTrVcyWJpclUT1uG79ffCPNKvBWEetTQ0mufpdRTA1Rw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1600857436923771.9432100472508; Wed, 23 Sep 2020 03:37:16 -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-7-3x8IVnRLN5CKxVQpKvfw4w-1; Wed, 23 Sep 2020 06:37:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F96F81F010; Wed, 23 Sep 2020 10:37:02 +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 153C75DD99; Wed, 23 Sep 2020 10:37:02 +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 8735244A73; Wed, 23 Sep 2020 10:37:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08NAaxrO019820 for ; Wed, 23 Sep 2020 06:36:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07D0A5C225; Wed, 23 Sep 2020 10:36:59 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 823B35C26B for ; Wed, 23 Sep 2020 10:36:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600857435; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Ow4u1EnsZ482v06Qif1JERq9mZbV8ZEuMafVLwc7dSk=; b=CeSg9nYlXlCa6VSylS9L9Ag2ajHE7vjI8wGTCzATKCQya/UGERWqyz0MdQ0dcizA0oWH/j y+mTonPTzpQ44C4V4Wm4PTGOCqywxkXQs/LwwzElsLE8YxHGO+GSKqIPc2/6YlC8xExIRg UBYpXSpSBrRuyMSo0Gki4/z4XAEf76Q= X-MC-Unique: 3x8IVnRLN5CKxVQpKvfw4w-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCHv2 2/2] tests: esxutilstest: depend on esx_gen_headers Date: Wed, 23 Sep 2020 12:36:51 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.14 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Sometimes parallel compilation randomly fails on platforms that do not have many drivers enabled, like macOS: In file included from ../tests/esxutilstest.c:13: ../src/esx/esx_vi_types.h:62:10: fatal error: 'esx_vi_types.generated.typed= ef' file not found #include "esx_vi_types.generated.typedef" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. List esx_gen_headers as a source to stop meson from building it before the headers are generated. https://gitlab.com/libvirt/libvirt/-/jobs/726039284 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/esx/meson.build | 5 +++++ tests/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/esx/meson.build b/src/esx/meson.build index 3e3d8591e5..2a7fcd54c9 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -81,3 +81,8 @@ else endif =20 esx_inc_dir =3D include_directories('.') + +esx_dep =3D declare_dependency( + include_directories: esx_inc_dir, + sources: esx_gen_headers, +) diff --git a/tests/meson.build b/tests/meson.build index f4fbb25e66..31e8d66c7a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -356,7 +356,7 @@ endif =20 if conf.has('WITH_ESX') tests +=3D [ - { 'name': 'esxutilstest', 'include': [ esx_inc_dir ] }, + { 'name': 'esxutilstest', 'deps': [ esx_dep ] }, ] endif =20 --=20 2.26.2