Follow-up test portability fixes for IRIX. (Chad Austin)

2 files changed, 10 insertions, 2 deletions

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index a570a71..47aa37e 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -861,6 +861,10 @@ def dir_index(directory):
     for file in os.listdir(directory):
         fullname = os.path.join(directory, file)
         files.append(fullname)
+
+    # os.listdir() isn't guaranteed to return files in any specific order,
+    # but some of the test code expects sorted output.
+    files.sort()
     return files
 
 def fs_delete(path, remove=1):
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 5f0eaa8..b7aa478 100644
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -631,21 +631,25 @@ class UtilTestCase(unittest.TestCase):
         test = TestCmd.TestCmd(workdir = '')
         base = test.workpath('')
         xxx = test.workpath('xxx.xxx')
+        ZZZ = test.workpath('ZZZ.ZZZ')
         sub1_yyy = test.workpath('sub1', 'yyy.yyy')
+        
         test.subdir('sub1')
         test.write(xxx, "\n")
+        test.write(ZZZ, "\n")
         test.write(sub1_yyy, "\n")
 
         old_stdout = sys.stdout
         sys.stdout = OutBuffer()
 
-        exp = "Removed " + os.path.join(base, sub1_yyy) + '\n' + \
+        exp = "Removed " + os.path.join(base, ZZZ) + "\n" + \
+              "Removed " + os.path.join(base, sub1_yyy) + '\n' + \
               "Removed directory " + os.path.join(base, 'sub1') + '\n' + \
               "Removed " + os.path.join(base, xxx) + '\n' + \
               "Removed directory " + base + '\n'
 
         SCons.Util.fs_delete(base, remove=0)
-        assert sys.stdout.buffer == exp
+        assert sys.stdout.buffer == exp, sys.stdout.buffer
         assert os.path.exists(sub1_yyy)
 
         sys.stdout.buffer = ""