BaseTools: Update Tests/TestTools.py to allow it to work on Windows

On Windows, executables have a '.exe' suffix which needs to be added for
them to be found in a path.

Also, files need to be explicitly opened as binary.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>

diff --git a/BaseTools/Tests/TestTools.py b/BaseTools/Tests/TestTools.py
index 1099fd4eeaea074fc8a6f620874cfdcf60afcd27..545e1e3c133a7e65a682d3ad9c3ecd6a20ae7bca 100644 (file)
--- a/BaseTools/Tests/TestTools.py
+++ b/BaseTools/Tests/TestTools.py
@@ -109,6 +109,8 @@ class BaseToolsTest(unittest.TestCase):
         else: logFile = None\r
 \r
         if toolName is None: toolName = self.toolName\r
+        if sys.platform == "win32":\r
+            toolName += ".exe"\r
         bin = self.FindToolBin(toolName)\r
         if logFile is not None:\r
             logFile = open(os.path.join(self.testDir, logFile), 'w')\r
@@ -135,7 +137,7 @@ class BaseToolsTest(unittest.TestCase):
         return open(os.path.join(self.testDir, fileName), mode)\r
 \r
     def ReadTmpFile(self, fileName):\r
-        f = open(self.GetTmpFilePath(fileName), 'r')\r
+        f = open(self.GetTmpFilePath(fileName), 'rb')\r
         data = f.read()\r
         f.close()\r
         return data\r