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>

diff --git a/BaseTools/Tests/RunTests.py b/BaseTools/Tests/RunTests.py
index 81af736cd8cf8c71af7e803b1db5d06fcd726b99..e8acf1b348b393641504af755d006d48d632d010 100644 (file)
--- a/BaseTools/Tests/RunTests.py
+++ b/BaseTools/Tests/RunTests.py
@@ -12,14 +12,6 @@
 import os\r
 import sys\r
 import unittest\r
-\r
-try:\r
-    import distutils.util\r
-except ModuleNotFoundError:\r
-    sys.exit('''\r
-Python reported: "No module named 'distutils.util"\r
-''')\r
-\r
 import TestTools\r
 \r
 def GetCTestSuite():\r

diff --git a/edksetup.sh b/edksetup.sh
index c7b2e1e2010aa46af1332c85281df9d0ca9bf68f..ed9ceae85d71eeb0e61acb17ed874fa93f981807 100755 (executable)
--- 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=$#