[edk2-devel] [PATCH] Revert "BaseTools:code of test python module is moved to edksetup"

[Fan, ZhijuX]

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 at intel.com>
Cc: Liming Gao <liming.gao at intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan at intel.com>
---
 BaseTools/Tests/RunTests.py |  8 ++++++++
 edksetup.sh                 | 15 ++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/BaseTools/Tests/RunTests.py b/BaseTools/Tests/RunTests.py
index e8acf1b348..81af736cd8 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 ed9ceae85d..c7b2e1e201 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=$#
-- 
2.14.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40282): https://edk2.groups.io/g/devel/message/40282
Mute This Topic: https://groups.io/mt/31552630/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-

-------------- next part --------------
A non-text attachment was scrubbed...
Name: winmail.dat
Type: application/ms-tnef
Size: 4071 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/edk2-devel-archive/attachments/20190509/c7659e60/attachment.bin>