diff options
| author | klarlund <klarlund@01de4be4-8c4a-0410-9132-4925637da917> | 2008-05-14 14:26:47 +0000 |
|---|---|---|
| committer | klarlund <klarlund@01de4be4-8c4a-0410-9132-4925637da917> | 2008-05-14 14:26:47 +0000 |
| commit | 40f1030c9773063e0a312230f108c1de7ccced03 (patch) | |
| tree | 6c23a916c4cba09189374db7fc51c6e727342dff | |
| parent | 3fbcec44f5923a69f76a725e4f6e5da29ba8789f (diff) | |
| download | distcc-40f1030c9773063e0a312230f108c1de7ccced03.tar.gz | |
Make distcc 3.0 compatible with Python 2.5.
Tests:
I made PATH=$PATH:/usr/python/bin (where python2.5 resides on my machine). I ran
autogen and reconfigured. Then I did:
make include-server-maintainer-check
make pump-maintainer-check
and I made sure that -Is now are set according to Python2.5.
git-svn-id: http://distcc.googlecode.com/svn/trunk@236 01de4be4-8c4a-0410-9132-4925637da917
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | include_server/include_server_test.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index dc984a6..9de33c3 100644 --- a/configure.ac +++ b/configure.ac @@ -215,7 +215,7 @@ AC_PROG_INSTALL # # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present # in autoconf 2.53. -AC_PATH_PROGS(PYTHON, [python2.4 python-2.4 python]) +AC_PATH_PROGS(PYTHON, [python2.5 python-2.5 python2.4 python-2.4 python]) AC_ARG_VAR(PYTHON, [Python interpreter]) # Python 1 doesn't even support -V if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then diff --git a/include_server/include_server_test.py b/include_server/include_server_test.py index c1309ec..c2eb781 100755 --- a/include_server/include_server_test.py +++ b/include_server/include_server_test.py @@ -139,10 +139,9 @@ class IncludeServerTest(unittest.TestCase): def Expect2(txt, force, never): - self_test.assert_( - "Include server internal error: 'exceptions.AssertionError" in txt) - - self_test.assert_("""for translation unit 'parse.c'""" in txt) + self.assert_("Include server internal error: " in txt, txt) + self.assert_('exceptions.AssertionError' in txt, txt) + self.assert_("""for translation unit 'parse.c'""" in txt, txt) # This email should be sent. self_test.assertEqual(never, False) |