[Python-checkins] r75199 - in python/branches/release26-maint: Lib/distutils/tests/test_sysconfig.py Misc/NEWS

Wed Feb 3 22:43:38 CET 2010

Hey Tarek,
On Fri, Oct 2, 2009 at 5:21 PM, tarek.ziade <python-checkins at python.org> wrote:
> Author: tarek.ziade
> Date: Sat Oct  3 03:21:38 2009
> New Revision: 75199
>> Log:
> Issue #7039: Fixed test_distutils when running tests on an installation with no build
>> Modified:
>   python/branches/release26-maint/Lib/distutils/tests/test_sysconfig.py
>   python/branches/release26-maint/Misc/NEWS
>> Modified: python/branches/release26-maint/Lib/distutils/tests/test_sysconfig.py
> ==============================================================================
> --- python/branches/release26-maint/Lib/distutils/tests/test_sysconfig.py       (original)
> +++ python/branches/release26-maint/Lib/distutils/tests/test_sysconfig.py       Sat Oct  3 03:21:38 2009
> @@ -30,30 +30,13 @@
>                             sysconfig.get_python_lib(prefix=TESTFN))
>>     def test_get_python_inc(self):
> -        # The check for srcdir is copied from Python's setup.py,
> -        # and is necessary to make this test pass when building
> -        # Python in a directory other than the source directory.
> -        (srcdir,) = sysconfig.get_config_vars('srcdir')
> -        if not srcdir:
> -            inc_dir = sysconfig.get_python_inc()
> -        else:

Why did you remove this section? This test no longer passes if Python
was built with src directory != obj directory. Can this be added back,
or if the test doesn't make sense in that configuration, can it be
skipped instead of failing?
Thanks,
Collin Winter
> -            # This test is not really a proper test: when building
> -            # Python from source, even in the same directory,
> -            # we won't be testing the same thing as when running
> -            # distutils' tests on an installed Python. Nevertheless,
> -            # let's try to do our best: if we are running Python's
> -            # unittests from a build directory that is not the source
> -            # directory, the normal inc_dir will exist, it will just not
> -            # contain anything of interest.
> -            inc_dir = sysconfig.get_python_inc()
> -            self.assert_(os.path.isdir(inc_dir))
> -            # Now test the source location, to make sure Python.h does
> -            # exist.
> -            inc_dir = os.path.join(os.getcwd(), srcdir, 'Include')
> -            inc_dir = os.path.normpath(inc_dir)
> -        self.assert_(os.path.isdir(inc_dir), inc_dir)
> +        inc_dir = sysconfig.get_python_inc()
> +        # This is not much of a test.  We make sure Python.h exists
> +        # in the directory returned by get_python_inc() but we don't know
> +        # it is the correct file.
> +        self.assertTrue(os.path.isdir(inc_dir), inc_dir)
>         python_h = os.path.join(inc_dir, "Python.h")
> -        self.assert_(os.path.isfile(python_h), python_h)
> +        self.assertTrue(os.path.isfile(python_h), python_h)
>>     def test_get_config_vars(self):
>         cvars = sysconfig.get_config_vars()
>> Modified: python/branches/release26-maint/Misc/NEWS
> ==============================================================================
> --- python/branches/release26-maint/Misc/NEWS   (original)
> +++ python/branches/release26-maint/Misc/NEWS   Sat Oct  3 03:21:38 2009
> @@ -15,6 +15,8 @@
>  Library
>  -------
>> +- Issue #7039: Fixed distutils.tests.test_sysconfig when running on
> +  installation with no build.
>>  What's New in Python 2.6.3
>  ==========================
> _______________________________________________
> Python-checkins mailing list
> Python-checkins at python.org
> http://mail.python.org/mailman/listinfo/python-checkins
>