From nobody Sat May 4 16:55:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+60371+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60371+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; t=1590608880; cv=none; d=zohomail.com; s=zohoarc; b=LOqA1e/tFAqziCbiOQQX4R0HuksxxptUHacQ9bNeJwkYbtauJo4t5/ztXUVYsNzGOmpr0QG4FhfiYeb2Xh6L2cX+7e5w/zMU0OMEpLpvdl7CRgB6X252wC4I9/2z75MQMy2VOiwvIOBIB/79ZK7ViRQAQIROJOyDTyb+wOkDPJo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590608880; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=MMsT0hF2PtQh4ukn/nExHEqRCancf0solFUqpC9NiyI=; b=kz1hQvceRdgfAViJITV3kAP/Pm58CNyV7jlgJ0ZBIb6QAX1eoqoRzM/v/n6w+XFiuLfYbRtc8X9S9HIxWAhFRGiTsPD/eqAV9nF9XuVHcvqve7037aQZeRUFR5bRJZ/UlpMjZidmrvPSyzUqUocWCcEGHYNNc9OJEPIZyKbQOOc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+60371+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1590608880743817.5328074331017; Wed, 27 May 2020 12:48:00 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id OUXRYY1788612x1FdVnItb69; Wed, 27 May 2020 12:48:00 -0700 X-Received: from hqnvemgate25.nvidia.com (hqnvemgate25.nvidia.com [216.228.121.64]) by mx.groups.io with SMTP id smtpd.web12.14.1590608525447374036 for ; Wed, 27 May 2020 12:42:05 -0700 X-Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Wed, 27 May 2020 12:40:41 -0700 X-Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Wed, 27 May 2020 12:42:04 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Wed, 27 May 2020 12:42:04 -0700 X-Received: from HQMAIL111.nvidia.com (172.20.187.18) by HQMAIL105.nvidia.com (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Wed, 27 May 2020 19:42:04 +0000 X-Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Wed, 27 May 2020 19:42:04 +0000 X-Received: from ipark-ubuntu.nvidia.com (Not Verified[10.28.100.106]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Wed, 27 May 2020 12:42:04 -0700 From: Name To: CC: Irene Park Subject: [edk2-devel] [PATCH] BaseTools/Python: Add missing FatalError handling Date: Wed, 27 May 2020 15:41:35 -0400 Message-ID: <9bbe8b916c10aa4dd79f7cfceb1ed35dd1a8c5f5.1590607347.git.ipark@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ipark@nvidia.com X-Gm-Message-State: x2mhFajyIdZgiG7FaljaPiEXx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1590608880; bh=mbo9fuWzgy+qyZZAtrE3kGNY/hGyPdIzlMG5FmzHNEQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=qXeSlOq94udmgVp39qs50wmBuQwEuXKJiYMGVk3jVMBJRgyOQ4jAGUxZRQWotLXIIyq hcQow5gT0CdeC4nbFHm3lXMHEMtldOQEuA5681VDIPpCHBjH7RxsZzVlB3Lzu4Jpe5vUj vYY79dsFGOiqm3nY7tjvSYUK8xCjphB/ecg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Irene Park AutoGenWorker doesn't handle the exception from FatalError therefore the build fails to return the proper error code at the exit. Signed-off-by: Irene Park --- BaseTools/Source/Python/AutoGen/AutoGenWorker.py | 6 ++++++ BaseTools/Source/Python/build/build.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/S= ource/Python/AutoGen/AutoGenWorker.py index 563d91b..2395964 100755 --- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py +++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py @@ -24,6 +24,7 @@ import traceback import sys from AutoGen.DataPipe import MemoryDataPipe import logging +from Common.BuildToolError import FatalError =20 def clearQ(q): try: @@ -101,6 +102,7 @@ class AutoGenManager(threading.Thread): self.autogen_workers =3D autogen_workers self.feedback_q =3D feedback_q self.Status =3D True + self.Error =3D 0 self.error_event =3D error_event def run(self): try: @@ -113,6 +115,7 @@ class AutoGenManager(threading.Thread): fin_num +=3D 1 else: self.Status =3D False + self.Error =3D self.feedback_q.get() self.TerminateWorkers() if fin_num =3D=3D len(self.autogen_workers): self.clearQueue() @@ -282,6 +285,9 @@ class AutoGenWorkerInProcess(mp.Process): =20 except Empty: pass + except FatalError as e: + self.feedback_q.put(taskname) + self.feedback_q.put(e.args[0]) except: self.feedback_q.put(taskname) finally: diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyth= on/build/build.py index ed3a3b9..d6e3d84 100755 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -880,7 +880,10 @@ class Build(): =20 self.AutoGenMgr.join() rt =3D self.AutoGenMgr.Status - return rt, 0 + err =3D 0 + if not rt: + err =3D self.AutoGenMgr.Error + return rt, err except FatalError as e: return False, e.args[0] except: --=20 2.7.4 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#60371): https://edk2.groups.io/g/devel/message/60371 Mute This Topic: https://groups.io/mt/74507933/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-