Reviewed-by: Bob Feng <bob.c.f...@intel.com> -----Original Message----- From: Fan, ZhijuX Sent: Tuesday, April 30, 2019 10:16 AM To: devel@edk2.groups.io Cc: Gao, Liming <liming....@intel.com>; Feng, Bob C <bob.c.f...@intel.com> Subject: [PATCH] BaseTools:The code used to test python module is moved to edksetup
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1582 testing for presence of python modules should be done in edksetup to reduce impact on subsequent build times. This code currently exists in BaseTools/Tests/RunTest.py. This patch is going to fix this issue. Cc: Bob Feng <bob.c.f...@intel.com> Cc: Liming Gao <liming....@intel.com> Signed-off-by: Zhiju.Fan <zhijux....@intel.com> --- BaseTools/Tests/RunTests.py | 8 -------- edksetup.sh | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/BaseTools/Tests/RunTests.py b/BaseTools/Tests/RunTests.py index 81af736cd8..e8acf1b348 100644 --- a/BaseTools/Tests/RunTests.py +++ b/BaseTools/Tests/RunTests.py @@ -12,14 +12,6 @@ import os import sys import unittest - -try: - import distutils.util -except ModuleNotFoundError: - sys.exit(''' -Python reported: "No module named 'distutils.util" -''') - import TestTools def GetCTestSuite(): diff --git a/edksetup.sh b/edksetup.sh index c7b2e1e201..add18ca7c0 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -177,11 +177,22 @@ function SetupPython() SetupPython3 } +function TestUtilModule() +{ + if ( $PYTHON_COMMAND -c "import distutils.util" >/dev/null 2>&1 );then + return 1 + else + echo Error: "No module named 'distutils.util" + return 0 + fi +} + function SourceEnv() { SetWorkspace && - SetupEnv - SetupPython + SetupEnv && + SetupPython && + TestUtilModule } I=$# -- 2.14.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40068): https://edk2.groups.io/g/devel/message/40068 Mute This Topic: https://groups.io/mt/31416326/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
