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

This reverts commit df7c81b5b219c9aee776baa466dd64c9d318dd80.

In commint df7c81b5b219c9,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 <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>

2 files changed, 10 insertions, 13 deletions

diff --git a/BaseTools/Tests/RunTests.py b/BaseTools/Tests/RunTests.py
index e8acf1b..81af736 100644
--- 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
index ed9ceae..c7b2e1e 100755
--- 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=$#