mirror of https://github.com/acidanthera/audk.git
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.feng@intel.com> Cc: Liming Gao <liming.gao@intel.com> Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
parent
26e2b295ec
commit
df7c81b5b2
|
@ -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():
|
||||
|
|
15
edksetup.sh
15
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=$#
|
||||
|
|
Loading…
Reference in New Issue