summaryrefslogtreecommitdiffstats
path: root/test/runtest
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-10-03 11:40:03 (GMT)
committerdirkbaechle <devnull@localhost>2012-10-03 11:40:03 (GMT)
commitaf2b9e2f216459fcdc26f367aaaf528d8122283b (patch)
tree28972b25a5bc9ba70bece2621adcc24af4d357ad /test/runtest
parent80cdf2501dfec07640481bf3d934add3e0cb0a04 (diff)
downloadSCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.zip
SCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.tar.gz
SCons-af2b9e2f216459fcdc26f367aaaf528d8122283b.tar.bz2
- final changes for bug2872 "Fix tests on Buildbot slaves", mainly switched all RPM tests to using the new rpmutils module
Diffstat (limited to 'test/runtest')
-rw-r--r--test/runtest/python.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/runtest/python.py b/test/runtest/python.py
index d406be4..bcbc062 100644
--- a/test/runtest/python.py
+++ b/test/runtest/python.py
@@ -43,7 +43,9 @@ test_pass_py = os.path.join('test', 'pass.py')
head, python = os.path.split(TestRuntest.python)
head, dir = os.path.split(head)
-mypython = os.path.join(head, dir, os.path.pardir, dir, python)
+# We have to normalize the python path here, because some installations don't like
+# getting called with "/bin/../bin/python" as first argument, e.g. Fedora 17 Desktop.
+mypython = os.path.normpath(os.path.join(head, dir, os.path.pardir, dir, python))
def escape(s):
return s.replace('\\', '\\\\')