From: Irene Park <ip...@nvidia.com>
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 <ip...@nvidia.com>
---
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/Source/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
def clearQ(q):
try:
@@ -101,6 +102,7 @@ class AutoGenManager(threading.Thread):
self.autogen_workers = autogen_workers
self.feedback_q = feedback_q
self.Status = True
+ self.Error = 0
self.error_event = error_event
def run(self):
try:
@@ -113,6 +115,7 @@ class AutoGenManager(threading.Thread):
fin_num += 1
else:
self.Status = False
+ self.Error = self.feedback_q.get()
self.TerminateWorkers()
if fin_num == len(self.autogen_workers):
self.clearQueue()
@@ -282,6 +285,9 @@ class AutoGenWorkerInProcess(mp.Process):
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/Python/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():
self.AutoGenMgr.join()
rt = self.AutoGenMgr.Status
- return rt, 0
+ err = 0
+ if not rt:
+ err = self.AutoGenMgr.Error
+ return rt, err
except FatalError as e:
return False, e.args[0]
except:
--
2.7.4
-=-=-=-=-=-=-=-=-=-=-=-
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/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
