From nobody Thu May 16 03:23:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40282+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40282+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557384610; cv=none; d=zoho.com; s=zohoarc; b=YQM2pBHh27yeJfiCkQkU0IyQWX6O5hG5UPki8dn0UpwK2hmVJb0+UFVMg7TD7uuJznVt7y8mIYNwgnVClVs9N/YWdTRvHtiUCsMtQF2MObBT2LAsN6yH974ENG5032LprZq/1Ksro/6CmJHcOTHcUK1dJTUqyBW2Cv0Tryihbyc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557384610; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=cx6GSOhxTzDAfbVKq0wwF993+L+2cGatmt5krwj6S0s=; b=PTyeTMvLBWSNcwZpqeCm4BF60fstqsBs77UOYqXK8cTBGGzhAU8sfpO3Cciow1+SIYuX8jRtZq99F/jLc517CT92OkLFFDRPUGGkca6G0vmJ988gWc76VrVa6plfEyshn18Imy+BIt930MhggXl6Ed01Mc7lIBGynmcouyKGB2M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40282+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557384610613748.4950488892242; Wed, 8 May 2019 23:50:10 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Wed, 08 May 2019 23:50:09 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 23:50:08 -0700 X-ExtLoop1: 1 X-Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2019 23:50:07 -0700 X-Received: from fmsmsx119.amr.corp.intel.com (10.18.124.207) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 8 May 2019 23:50:07 -0700 X-Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX119.amr.corp.intel.com (10.18.124.207) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 8 May 2019 23:50:07 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.126]) with mapi id 14.03.0415.000; Thu, 9 May 2019 14:50:05 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] Revert "BaseTools:code of test python module is moved to edksetup" Thread-Topic: [PATCH] Revert "BaseTools:code of test python module is moved to edksetup" Thread-Index: AdUGM22nSTbMj2bGTfWz/E0ak0QcsQ== Date: Thu, 9 May 2019 06:50:05 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D76ASHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557384610; bh=2XEBZfJjve8GWMVs+sRfqmDuPRaijHM5I4RMXNfzkdI=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=jI0Z2Jd1SKtxI6le6OyJlBz7RZBpQr60bRFcgaS/Xv5UN6nZUL9nXPFXdmPXwNjysO2 EKrk9T6asz6Wmt/I39GHpehrNn8lVH7nSub0q6qDUz/bQ77tEV3i2jYhCt8dNnuX2NKB1 OMNA2azxZ660Y5ew6y+2ATxY1xSJdyTGSD4= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D76ASHSMSX101ccrcor_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Cc: Liming Gao Signed-off-by: Zhiju.Fan Reviewed-by: Bob Feng =20 --- 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 =20 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 } =20 -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 } =20 I=3D$# --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D76ASHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IrYPAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADIwN0M0MjEz QjQ4NTE2NDZBNjJBQjdGODA1Q0QzMzA0APEGAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAJAAYA MgAFAAQAOQEBIIADAA4AAADjBwUACQAGADIABQAEADkBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEsAAABbUEFUQ0hdIFJldmVydCAiQmFzZVRvb2xzOmNvZGUgb2YgdGVz dCBweXRob24gbW9kdWxlIGlzIG1vdmVkIHRvIGVka3NldHVwIgCBGgELgAEAIQAAADIwN0M0MjEz QjQ4NTE2NDZBNjJBQjdGODA1Q0QzMzA0APEGAQOQBgCkDgAAMwAAAAIBfwABAAAASAAAADxGQUQw RDdFMEFFMEZBNTREOTg3RjZFNzI0MzVDQUZENTBBRjVENzZBQFNIU01TWDEwMS5jY3IuY29ycC5p bnRlbC5jb20+AAsAHw4BAAAAAgEJEAEAAADCBAAAvgQAAKYIAABMWkZ1ibY5ZGEACmZiaWQEAABj Y8BwZzEyNTIA/gND8HRleHQB9wKkA+MCAARjaArAc2V0MCDvB20CgwBQEU0yCoAGtAKAln0KgAjI OwliMTkOwL8JwxZyCjIWcQKAFWIqCbBzCfAEkGF0BbIOUANgc6JvAYAgRXgRwW4YMF0GUnYEkBe2 AhByAMB0fQhQbhoxECAFwAWgG2RkmiADUiAQIheyXHYIkOR3awuAZDUdUwTwB0ANF3AwCnEX8mJr bWsGcwGQACAgQk1fQuBFR0lOfQr8AfEL8fUSQGgEACAJcBtyBCAFoAhtbWkFQGRmN2NAODFiNWIy FnBjBDlhCeA3NzZiYQBhNDY2ZGQ2NCEjoGQzMTgkgDgwaC5cbAuAZQqBJYRJzwOgInMCMCLdLHUS ABxggmEccHVuY3RpAiANHMBvHMEfYCBweXQ2aCjBBGF1HnAldUJ1pwVAKZAZ4EJvBvBlA5F2dgdA ClAgGTAq4wlwdH8IcCubIcEoZyHBKvEldW+8cHAZECKwK/cIUHIJcMsokCHhcyoQdCwwpQuAvmcu UAOgA5EocBAwcDBxRxxRMLQlfENjOishYiwgRgnwMbA8BuBiLihjLmY0sUAmwWVsazUwA3A+M7lM B3AxkkeaYSkAPCWANyIuZzeAkzWvFMBpZxhQZC0ZMFBmLWJ5NEBaIbBqSHUuRgORPHo6gnjnNVAA cDhvCi084CV1H7CKYRIAVCtBcy9UKTEtPhBSKHA+My4pcCB84CAgOCArP6U9FgmAwx9QLJFwLnNo P2BBXXk/UDE1P5E84ULYPRYy7xxwAxAHkRmUZDEQHpAxwYcSAAAgKLFzKCspRRGeMyLQNeASEEXD LSklfCsN4AEgIDzgZyKxYS/7PZ8+qWJI7z6ZJXUdsRAwDUCQOADQAEBiMzQ4FC4uIyBhIvAzNmPr JTBFITAkoDQ8eEjPS7+fJbE/oUqvUN8lsUBASGAZDpAsNj+QVNExNCB/VJA9FgdwL1AfkRkQVb1z fnlWvihwIrApIlGmUaZ0/nI6QFGmQVJWNQ3hLKAooJ1S4C5cAlGmEDBjZQUxwk0p805vdEYIYB3A 3kUwUAWwWotXsS4QMCKw7CgnYCBRplAphAlwVlIbCYA0QCJd8CnVIG5h6weAHGAnW8wiUaZgIUc2 /0AXVjVTElKzPRY9FgEBN2AlEhBDUxJTdS+BKCm/WoZIK0CqUlBAqUyMZCOQkytwTVA1ZE3wYzcj YJUXcGUB0DFOsjc1HeA/TzprH1IFbz9UhCPwLDL3RCBVIHIhMW3gVJEoZwZgv0DxYNRowD0WP2Bz yTNmt9sgQGbMLShnUxJVXBFdlD90dz0AAAA8hVsxLCAoIAAkUFlUSE9OX4BDT01NQU5ESGCOY2HQ W19joyA+LwEAGHYvbioQAyAyPib5beApOyrxC5B51z9gLIX/AFB51zXgEgB+ygWQKaAZYP9eg2Hf Yu9+zwOgAUB510RAv3kndoY9B3M4CGFdQEUbYPd0eHmndQRXBbAfUAqwXUD4ICYmechzw4kBi190 Bf+Mq3gsWpiMJo/dYNR1/2cnMEk9JCM8d2cmMi7bVWCVQC4D8B3Abx4wlUAHJXwVQpdQAAAfAEIA AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAGUAAQAAACoAAAB6AGgAaQBqAHUAeAAu AGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AZAABAAAACgAAAFMATQBUAFAAAAAAAAIB QQABAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAA AFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAJd AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8A5V8B AAAAMgAAAHMAaQBwADoAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAAfABoMAQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfAB8MAQAAACoAAAB6AGgAaQBq AHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AHgwBAAAACgAAAFMATQBUAFAA AAAAAAIBGQwBAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBq AHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAfAAFdAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAA AB8A+D8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AI0ABAAAAKgAAAHoAaABpAGoA dQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAiQAEAAAAKAAAAUwBNAFQAUAAA AAAAAgH5PwEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoAaABpAGoA dQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAA AB8ACV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAA CwBAOgEAAAAfABoAAQAAABIAAABJAFAATQAuAE4AbwB0AGUAAAAAAAMA8T8JBAAACwBAOgEAAAAD AP0/5AQAAAIBCzABAAAAEAAAACB8QhO0hRZGpiq3+AXNMwQDABcAAQAAAEAAOQCATNduMwbVAUAA CDBXy+xuMwbVAR8AAICGAwIAAAAAAMAAAAAAAABGAQAAAB4AAABhAGMAYwBlAHAAdABsAGEAbgBn AHUAYQBnAGUAAAAAAAEAAAAMAAAAZQBuAC0AVQBTAAAAHwA3AAEAAACWAAAAWwBQAEEAVABDAEgA XQAgAFIAZQB2AGUAcgB0ACAAIgBCAGEAcwBlAFQAbwBvAGwAcwA6AGMAbwBkAGUAIABvAGYAIAB0 AGUAcwB0ACAAcAB5AHQAaABvAG4AIABtAG8AZAB1AGwAZQAgAGkAcwAgAG0AbwB2AGUAZAAgAHQA bwAgAGUAZABrAHMAZQB0AHUAcAAiAAAAAAAfAD0AAQAAAAIAAAAAAAAAAwA2AAAAAAACAXEAAQAA ABYAAAAB1QYzbadJNsyPZsZN9bP8TRqTRByxAAAfAHAAAQAAAJYAAABbAFAAQQBUAEMASABdACAA UgBlAHYAZQByAHQAIAAiAEIAYQBzAGUAVABvAG8AbABzADoAYwBvAGQAZQAgAG8AZgAgAHQAZQBz AHQAIABwAHkAdABoAG8AbgAgAG0AbwBkAHUAbABlACAAaQBzACAAbQBvAHYAZQBkACAAdABvACAA ZQBkAGsAcwBlAHQAdQBwACIAAAAAAB8ANRABAAAAkAAAADwARgBBAEQAMABEADcARQAwAEEARQAw AEYAQQA1ADQARAA5ADgANwBGADYARQA3ADIANAAzADUAQwBBAEYARAA1ADAAQQBGADUARAA3ADYA QQBAAFMASABTAE0AUwBYADEAMAAxAC4AYwBjAHIALgBjAG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBv AG0APgAAAAMA3j+fTgAAQAAHMC0q5W4zBtUBAgELAAEAAAAQAAAAIHxCE7SFFkamKrf4Bc0zBAMA JgAAAAAAAgFHAAEAAAAyAAAAYz1VUzthPU1DSTtwPUludGVsO2w9U0hTTVNYMTAxLTE5MDUwOTA2 NTAwNVotODk2NgAAAAIBEDABAAAARgAAAAAAAAAmd705O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/ bnJDXK/VAAAARBFeAACmk2g2iHZsS6dK0+tHmkxkAAAJVI9tAAAAAB8A+j8BAAAAGAAAAEYAYQBu ACwAIABaAGgAaQBqAHUAWAAAAAMACVkBAAAAQAAAgAggBgAAAAAAwAAAAAAAAEYAAAAAv4UAANBT qW0zBtUBCwAAgAggBgAAAAAAwAAAAAAAAEYAAAAAgoUAAAAAAAAfAACAhgMCAAAAAADAAAAAAAAA RgEAAAAYAAAAZABsAHAALQBwAHIAbwBkAHUAYwB0AAAAAQAAABoAAABkAGwAcABlAC0AdwBpAG4A ZABvAHcAcwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGAAAAGQAbABwAC0AdgBlAHIAcwBp AG8AbgAAAAEAAAAWAAAAMQAxAC4AMAAuADYAMAAwAC4ANwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAA AEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBuAAAAAAABAAAAFAAAAG4AbwAtAGEAYwB0 AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAgAAAAeAAtAG0AcwAtAGgA YQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAi AAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkAcAAAAAAAAQAAACAAAABbADEAMAAuADIA MwA5AC4AMQAyADcALgA0ADAAXQAAALEm --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5D76ASHSMSX101ccrcor_--