When I build the trunk with srcdir != builddir test_distutils fails when running tests.

To reproduce:
* Create a checkout of the trunk and chdir into this
* mkdir build
* cd build
* ../configure
* make test

This results in a failure for test_distutils

distutils.sysconfig.get_python_inc() uses  "os.path.dirname(os.path.abspath(sys.executable))" to find the srcdir.

I'll change it to "sysconfig.get_config_var('srcdir')"

Mmm, the problem is that srcdir is given by the Makefile. So I need to find the Makefile. I don't know how to get these info from a python built in another directory. Investigating...

get_config_var('srcdir') should work, with should then be combined with the path to the Makefile, something like:

os.path.join(
   os.path.dirname(os.path.abspath(
      _get_makefile_filename(), get_config_var('srcdir')))

The path.join is necessary because srcdir is most likely a relative path (in my example the value is 'srcdir')

Ah, found a way:

buildir = os.path.dirname(sys.executable)
srcdir = os.path.abspath(os.path.join(buildir, get_config_var('srcdir')))

It does work just fine, see the attached patch.

Actually attaching the patch might help.

With this patch test_distutils passes, without it it doesn't.

Yes it's pretty similar to what I've done in my earlier message.

No need to call os.path.dirname(get_makefile_filename()),
os.path.dirname(sys.executable) is enough.

I guess the patch part concerning unixcompiler is unrelated to this issue, right ?

Yes, sorry about that. The patch in unixcompiler is for issue #7724.

Fixed in r80649, r80650 

I'll merge in the py3k branch once I've reverted distutils there

Hmm, this issue was fixed before.
My be restore of 2.6 distutils ignore those fixes. It is good to compare current Lib/distutils/sysconfig.py with version from Dec 2009 .

I intend to forward port the fix to 3.2 in the near future, to avoid missing real issues when I do updates to the platform support for OSX.

I've fixed this issue for the 3.2 branch in r81999.

Looks like this just broke the 3.x buildbots.


======================================================================
FAIL: test_get_python_inc (distutils.tests.test_sysconfig.SysconfigTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/buildbot/cpython-ucs2/3.x.pitrou-ubuntu/build/Lib/distutils/tests/support.py", line 16, in _capture_warnings
    return func(*args, **kw)
  File "/home/buildbot/cpython-ucs2/3.x.pitrou-ubuntu/build/Lib/distutils/tests/test_sysconfig.py", line 47, in test_get_python_inc
    self.assertTrue(os.path.isdir(inc_dir), inc_dir)
AssertionError: Include

======================================================================
FAIL: test_user_site (distutils.tests.test_install.InstallTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/buildbot/cpython-ucs2/3.x.pitrou-ubuntu/build/Lib/distutils/tests/test_install.py", line 100, in test_user_site
    self._test_user_site()
  File "/home/buildbot/cpython-ucs2/3.x.pitrou-ubuntu/build/Lib/distutils/tests/test_install.py", line 129, in _test_user_site
    self.assertTrue(os.path.exists(self.user_base))
AssertionError: False is not True

Sigh. test.test_distutils behaves different when run through regrtest than when run directly.

I have a fix, but am running an extended test cycle before committing (that is, both with and without srcdir==builddir)

This should be fixed in r82005, this passes all tests both with and without srcdir==builddir

As I said earlier, I am going to revert Distutils state in py3k so it's like the 3.1 branch. So the changes in distutils/ in py3k that are not backported in 3.1 will be lost.

I had a lack of time lately, but I should be able to do it this week.

Tarek: I'm not 100% that all my changes in Lib/distutils were backported to 3.1. This last patch definitely wasn't, but isn't also isn't relevant for 3.1.

As r82005 fixed the problem this issue can be closed.