diff options
| -rw-r--r-- | BaseTools/Tests/RunTests.py | 8 | ||||
| -rwxr-xr-x | 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=$# |