Ice.PrintProcessId, run.py cleanup

1 files changed, 6 insertions, 6 deletions

diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py
index 895e5cf397a..713818fa60d 100755
--- a/cpp/test/Slice/errorDetection/run.py
+++ b/cpp/test/Slice/errorDetection/run.py
@@ -11,14 +11,14 @@
 
 import os, sys, re
 
-for toplevel in ["", "..", os.path.join("..", ".."), os.path.join("..", "..", "..")]:
-    if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")):
+for toplevel in [".", "..", "../..", "../../..", "../../../.."]:
+    if os.path.exists(os.path.normpath(toplevel + "/config/TestUtil.py")):
         break
 else:
     raise "can't find toplevel directory!"
 
-directory = os.path.join(toplevel, "test", "Slice", "errorDetection")
-slice2cpp = os.path.join(toplevel, "bin", "slice2cpp")
+directory = os.path.normpath(toplevel + "/test/Slice/errorDetection")
+slice2cpp = os.path.normpath(toplevel + "/bin/slice2cpp")
 
 regex1 = re.compile(r".ice$", re.IGNORECASE)
 files = []
@@ -30,9 +30,9 @@ for file in files:
 
     print file + "...",
 
-    stdin, stdout, stderr = os.popen3(slice2cpp + " " + os.path.join(directory, file))
+    stdin, stdout, stderr = os.popen3(slice2cpp + " " + os.path.normpath(directory + "/" + file))
     lines1 = stderr.readlines()
-    lines2 = open(os.path.join(directory, regex1.sub(".err", file)), "r").readlines()
+    lines2 = open(os.path.normpath(directory + "/" + regex1.sub(".err", file)), "r").readlines()
 
     if len(lines1) != len(lines2):
         print "failed!"