diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2001-12-06 13:35:19 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2001-12-06 13:35:19 +0000 |
| commit | 119382a8122dc0ca1e7805e638a12a667d100866 (patch) | |
| tree | 15af9ac8f9a1aea2980909e9a8f21244262db169 /cpp/test/Slice/errorDetection/run.py | |
| parent | porting against C++ tag icej_baseline_12052001; removing server components (diff) | |
| download | ice-119382a8122dc0ca1e7805e638a12a667d100866.tar.bz2 ice-119382a8122dc0ca1e7805e638a12a667d100866.tar.xz ice-119382a8122dc0ca1e7805e638a12a667d100866.zip | |
Some python changes.
Diffstat (limited to 'cpp/test/Slice/errorDetection/run.py')
| -rwxr-xr-x | cpp/test/Slice/errorDetection/run.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index 0d1c9098dcd..a38d6f39def 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -12,13 +12,13 @@ import os, sys, re for toplevel in [".", "..", "../..", "../../..", "../../../.."]: - if os.path.exists(os.path.normpath(toplevel + "/config/TestUtil.py")): + if os.path.exists(os.path.join(toplevel, "config", "TestUtil.py")): break else: raise "can't find toplevel directory!" -directory = os.path.normpath(toplevel + "/test/Slice/errorDetection") -slice2cpp = os.path.normpath(toplevel + "/bin/slice2cpp") +directory = os.path.join(toplevel, "test", "Slice", "errorDetection") +slice2cpp = os.path.join(toplevel, "bin", "slice2cpp") regex1 = re.compile(r".ice$", re.IGNORECASE) files = [] @@ -33,9 +33,9 @@ for file in files: print file + "...", - stdin, stdout, stderr = os.popen3(slice2cpp + " " + os.path.normpath(directory + "/" + file)) + stdin, stdout, stderr = os.popen3(slice2cpp + " " + os.path.join(directory, file)) lines1 = stderr.readlines() - lines2 = open(os.path.normpath(directory + "/" + regex1.sub(".err", file)), "r").readlines() + lines2 = open(os.path.join(directory, regex1.sub(".err", file)), "r").readlines() if len(lines1) != len(lines2): print "failed!" |