BaseTools/Tests/RunTests.py | 8 ++++++++ edksetup.sh | 15 ++------------- 2 files changed, 10 insertions(+), 13 deletions(-)
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>
---
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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Reviewed-by: Bob Feng <bob.c.feng@intel.com> -----Original Message----- From: Fan, ZhijuX Sent: Thursday, May 9, 2019 2:50 PM To: devel@edk2.groups.io Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com> Subject: [PATCH] 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> --- 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 (#40285): https://edk2.groups.io/g/devel/message/40285 Mute This Topic: https://groups.io/mt/31552630/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.