From: "Bob Feng" <bob.c.feng@intel.com>
To: "Fan, ZhijuX" <zhijux.fan@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Gao, Liming" <liming.gao@intel.com>
Subject: Re: [PATCH] Revert "BaseTools:code of test python module is moved to edksetup"
Date: Thu, 9 May 2019 07:00:32 +0000 [thread overview]
Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D160109598@SHSMSX101.ccr.corp.intel.com> (raw)
In-Reply-To: <FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D76A@SHSMSX101.ccr.corp.intel.com>
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
prev parent reply other threads:[~2019-05-09 7:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-09 6:50 [PATCH] Revert "BaseTools:code of test python module is moved to edksetup" Fan, ZhijuX
2019-05-09 7:00 ` Bob Feng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08650203BA1BD64D8AD9B6D5D74A85D160109598@SHSMSX101.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox