Revert "BaseTools:code of test python module is moved to edksetup"

This reverts commit df7c81b. In commint df7c81b,used a function to test python module But the Boolean value of the return value of this function is the opposite of the Correct result, resulting in an unexpected result Cc: Bob Feng <[email protected]> Cc: Liming Gao <[email protected]> Signed-off-by: Zhiju.Fan <[email protected]> Reviewed-by: Bob Feng <[email protected]>
xiaoyuxlu · May 9, 2019 · 4969320 · 4969320
1 parent 51e9be0
commit 4969320
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/BaseTools/Tests/RunTests.py b/BaseTools/Tests/RunTests.py
@@ -12,6 +12,14 @@
 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
@@ -177,22 +177,11 @@ 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 &&
-  TestUtilModule
+  SetupEnv
+  SetupPython
 }
 
 I=$#