From nobody Fri May 3 15:04:08 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=1600852693; cv=none; d=zohomail.com; s=zohoarc; b=nWpyj/gugkTgbdwCbVQtmhPSkDxhrSqB7J0zfYti8+bJ4xrjqF9n7mGZ1bbCYV0+epcYK4/bn2WxVSFkAte1/7aTAuvovxS8g5w1xnbWQ4S790Lgc2hAMAkchYzzsWPbxHetYKtMvO9UI2+s9sPIzE1Sp0Z3Y2PXoj4ZZlTkZ0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852693; 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=I0C2GLlRNCU7fsOV01LyJ/AF3I0C1etqTTGURh2I13w=; b=bTs0j5vxXEybK5SiePrCsabw+53aiqjo/8FDjBFaShVsoicu38sRJzqL6EMe7rkp28f1XNmLLd8byNoaqd5yPbEcPbQvu4T2CO9UlA12T6Fh5gDuvMX5k22NokPKjnfaUKq04UQyjdrGe9EQH6WyfiBI3KE8FnQgN+d7qPjxzFs= 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 1600852693723751.2152418001484; Wed, 23 Sep 2020 02:18:13 -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-212-I4-ybBTgOjal6ZM-7rHDcg-1; Wed, 23 Sep 2020 05:18:08 -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 AD5F181CBE7; Wed, 23 Sep 2020 09:17:58 +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 7069C5DD99; Wed, 23 Sep 2020 09:17:58 +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 0CA2E18095FF; Wed, 23 Sep 2020 09:17:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08N9Hsh8010772 for ; Wed, 23 Sep 2020 05:17:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2DBE455778; Wed, 23 Sep 2020 09:17:54 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id A72FC55768 for ; Wed, 23 Sep 2020 09:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852692; 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=I0C2GLlRNCU7fsOV01LyJ/AF3I0C1etqTTGURh2I13w=; b=L+tAxLtWPZ9/MNvA+hObW43uGvVH78j375Xx+uVwf92bToZP+uRtOuyY2791SyVOYZlnPX eH/qDUbP90ZZDDOnNcfDViHf0hiy4RW9OaTvrXrR8ZQNEEYx1ltscle/1hQQXVOROgiG+U dQUj3J0yjvQSBnWj4GUf5uQHqYZI1TA= X-MC-Unique: I4-ybBTgOjal6ZM-7rHDcg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] esx: separate header and source file generation Date: Wed, 23 Sep 2020 11:17:43 +0200 Message-Id: <6f64179dce77adc2a1135c435f594f6cb1d61f0e.1600852599.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) Invoke the generator twice and introduce separate meson targets for headers and C sources. Signed-off-by: J=C3=A1n Tomko --- scripts/esx_vi_generator.py | 159 ++++++++++++++++++++---------------- src/esx/meson.build | 31 +++++-- 2 files changed, 114 insertions(+), 76 deletions(-) diff --git a/scripts/esx_vi_generator.py b/scripts/esx_vi_generator.py index 7929e1e682..2fac5152e5 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_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_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_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,112 @@ 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_typetostring.write(notice) + types_typefromstring.write(notice) + types_header.write(notice) + methods_header.write(notice) + helpers_header.write(notice) +else: + 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_typetostring.write(enums_by_name[name].generate_typetostring= ()) + types_typefromstring.write(enums_by_name[name].generate_typefromst= ring()) + types_header.write(enums_by_name[name].generate_header()) + else: + 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") + 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_typetostring.write(objects_by_name[name].generate_typetostri= ng()) + types_typefromstring.write(objects_by_name[name].generate_typefrom= string()) + types_header.write(objects_by_name[name].generate_header()) + else: + 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") + 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_typetostring.write(managed_objects_by_name[name].generate_ty= petostring()) + types_typefromstring.write(managed_objects_by_name[name].generate_= typefromstring()) + types_header.write(managed_objects_by_name[name].generate_header()) + else: + 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..b7a55f6b54 100644 --- a/src/esx/meson.build +++ b/src/esx/meson.build @@ -12,18 +12,15 @@ 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', @@ -34,6 +31,27 @@ 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', + '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', + ], + command: [ + meson_python_prog, python3_prog.path(), esx_vi_generator_prog.path(), + meson.source_root() / 'src', + meson.build_root() / 'src', + 'source', ], ) =20 @@ -42,6 +60,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 15:04:08 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=1600852688; cv=none; d=zohomail.com; s=zohoarc; b=ZpI3QPiTXpRC3O7YV6QPGOInkiy8vS1mlOMexFO6uQnn8asRrn+KMnHxi69U/QBa8/7NiPV43lh0qqz9ELWX+jGfEpptLWcaQnq+VOsY6o61+9l9PUzGSIK27rnvhbKyj6KblY1nnkxhwT4LpD+Pi/mSrc5b961n6tI8ffd6bEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852688; 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=ald3ZPIGwywu8uNgL0JKaM4pTpaTwApp3+qer2h3Z4c=; b=QtBFid/R9MyU1zgd4BEdNxv7AWdsSvTTcPf4B7F/GGY7R+nuIZJRGCB1vVIrUfbxjs5Te1uF33gNS06AQ1PNXWwwNJ+My3Tj1KQUWmJesLtw1orafbUHef79/r48ZScBEeunfa5sYz0vbeE6CnEiT7/6XLkKnAcoVEK5phytpGs= 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 1600852688771475.7953436651894; Wed, 23 Sep 2020 02:18:08 -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-76-PQ_-c1rbMYidY2CfRuFwDw-1; Wed, 23 Sep 2020 05:18:03 -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 20A1D186DD29; Wed, 23 Sep 2020 09:17:59 +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 EB8F53A40; Wed, 23 Sep 2020 09:17:58 +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 4739E44A46; Wed, 23 Sep 2020 09:17:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08N9HtSK010778 for ; Wed, 23 Sep 2020 05:17:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 028953A40; Wed, 23 Sep 2020 09:17:55 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C1E055768 for ; Wed, 23 Sep 2020 09:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852687; 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=ald3ZPIGwywu8uNgL0JKaM4pTpaTwApp3+qer2h3Z4c=; b=draWR5y51oA6lT/GjuWzvKFzCTuyi02im8HeDuMXdEu+PM/807xAGgkzw8LQpbnQnrhGBO Bl/BVLYk+yfRsa4mMjsRFflOzgQ8/Oovbk1uRmxCAhCd4P2yUVfXxrgKTj0UDNuNMO4B8A zaxVWP37EOKGJzpspMr53Ra4InkcDV0= X-MC-Unique: PQ_-c1rbMYidY2CfRuFwDw-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] tests: esxutilstest: depend on esx_gen_headers Date: Wed, 23 Sep 2020 11:17:44 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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) 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 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 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 --- tests/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index f4fbb25e66..8ae201fd69 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -355,8 +355,9 @@ if conf.has('WITH_BHYVE') endif =20 if conf.has('WITH_ESX') + esxutilstest_sources =3D [ 'esxutilstest.c', esx_gen_headers ] tests +=3D [ - { 'name': 'esxutilstest', 'include': [ esx_inc_dir ] }, + { 'name': 'esxutilstest', 'sources': esxutilstest_sources, 'include': = [ esx_inc_dir ] }, ] endif =20 --=20 2.26.2 From nobody Fri May 3 15:04:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1600852704; cv=none; d=zohomail.com; s=zohoarc; b=br+fUpGNzLjIOL/ETvUjKPb3N7Miznw+TQ4YIvOmu6S/p95dZOEE3ZDpSaDofEv1DLmpVXkj3W/qPueFXIdHGHEnjs2zIX9UWGth2qyELdnhz2fxy3IRKcaKBKrCgwAPYIROOOw/OHZcgQc1pVMDeP8RT8n1EsTMJorvYmGV1o0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600852704; 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=Xux5k3T90y4Z351PbPjI8xPTG7PoKqJh5zaFjBnz44E=; b=W3j70P7aHDBf95NnF0hiZLcBjXJs8G9+UvRbk3U+C764rzJ05G1+GpaL4iUAwbjlr8LTG4HHMfYQaiqxaQCNnka6Nz+TOPD8ZkXnrBBwSQM5NlgedpAeOjTfRZx24BbjUBxokBT/MjT88nOd9YdfE3KpMgaSbBdpxxmnbsV04TE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1600852704684402.33666657024287; Wed, 23 Sep 2020 02:18:24 -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-412-8IpCpWYINnOKoppo8ehycA-1; Wed, 23 Sep 2020 05:18:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6C8B581CBEB; Wed, 23 Sep 2020 09:18:15 +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 489451002D46; Wed, 23 Sep 2020 09:18:15 +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 0D9DA8C7B2; Wed, 23 Sep 2020 09:18:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 08N9HwqY010798 for ; Wed, 23 Sep 2020 05:17:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F8DC3A40; Wed, 23 Sep 2020 09:17:58 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id D960255783 for ; Wed, 23 Sep 2020 09:17:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852703; 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=Xux5k3T90y4Z351PbPjI8xPTG7PoKqJh5zaFjBnz44E=; b=ElCG2Uzmw678LCWub0cCzd2gOtGQ0AzLnJRwkYq7i5TUv3OuvWMZW616kEJgPqiCbPWPWR 0AuFOkRrMSbmZZXIzF1CTqIl8GlAD8BHXHgbiiPew5odtkbQJ8puduHfJb3iF7hPOryY3H vyfSsjonjaeSBQv1rwBO+RjeHewdz5k= X-MC-Unique: 8IpCpWYINnOKoppo8ehycA-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/3] sleep Date: Wed, 23 Sep 2020 11:17:45 +0200 Message-Id: <41b7ce9e40ece981c4ceb0814d6d273fc74ae8db.1600852600.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.84 on 10.5.11.22 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" meson build --werror -Dsystem=3Dtrue \ -Ddriver-qemu=3Ddisabled -Ddriver-lxc=3Ddisabled \ -Ddriver-libxl=3Ddisabled -Ddriver-vbox=3Ddisabled \ -Ddriver-network=3Ddisabled -Ddriver-interface=3Ddisabled --- scripts/esx_vi_generator.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/esx_vi_generator.py b/scripts/esx_vi_generator.py index 2fac5152e5..fc29ec4a71 100755 --- a/scripts/esx_vi_generator.py +++ b/scripts/esx_vi_generator.py @@ -25,6 +25,7 @@ import sys import os import os.path +import time =20 =20 OCCURRENCE__REQUIRED_ITEM =3D "r" @@ -43,6 +44,8 @@ autobind_names =3D set() =20 separator =3D "/* " + ("* " * 37) + "*\n" =20 +time.sleep(15) + =20 def aligned(left, right, length=3D59): return left.ljust(length, ' ') + right --=20 2.26.2