Fix some problems found if no MS compiler at all

A few tests blew up with exceptions (AttributeError, IndexError) if no
compiler is installed on Windows - from where they are it could possibly
happen on other platforms as well.

Signed-off-by: Mats Wichmann <mats@linux.com>

2 files changed, 5 insertions, 2 deletions

diff --git a/testing/framework/TestCmd.py b/testing/framework/TestCmd.py
index 96b8b5d..6699d88 100644
--- a/testing/framework/TestCmd.py
+++ b/testing/framework/TestCmd.py
@@ -1590,7 +1590,10 @@ class TestCmd(object):
         elif run < 0:
             run = len(self._stdout) + run
         run = run - 1
-        return self._stdout[run]
+        try:
+            return self._stdout[run]
+        except IndexError:
+            return None
 
     def subdir(self, *subdirs):
         """Create new subdirectories under the temporary working
diff --git a/testing/framework/TestSCons.py b/testing/framework/TestSCons.py
index 68641f0..69d4bd5 100644
--- a/testing/framework/TestSCons.py
+++ b/testing/framework/TestSCons.py
@@ -310,7 +310,7 @@ class TestSCons(TestCommon):
             if v != prog:
                 return None
             result = env.WhereIs(prog)
-            if norm and os.sep != '/':
+            if result and norm and os.sep != '/':
                 result = result.replace(os.sep, '/')
             return result