Commit f11ca536 authored by Tarek Ziadé's avatar Tarek Ziadé

Merged revisions 69106 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69106 | tarek.ziade | 2009-01-30 00:49:17 +0100 (Fri, 30 Jan 2009) | 1 line

  fixed test_make_distribution so it runs on any platform, as long as tar an gzip are available
........
parent f7bf90fd
...@@ -10,7 +10,7 @@ from distutils.command.sdist import sdist ...@@ -10,7 +10,7 @@ from distutils.command.sdist import sdist
from distutils.core import Distribution from distutils.core import Distribution
from distutils.tests.test_config import PyPIRCCommandTestCase from distutils.tests.test_config import PyPIRCCommandTestCase
from distutils.errors import DistutilsExecError from distutils.errors import DistutilsExecError
from distutils.spawn import spawn from distutils.spawn import find_executable
CURDIR = os.path.dirname(__file__) CURDIR = os.path.dirname(__file__)
TEMP_PKG = join(CURDIR, 'temppkg') TEMP_PKG = join(CURDIR, 'temppkg')
...@@ -111,16 +111,13 @@ class sdistTestCase(PyPIRCCommandTestCase): ...@@ -111,16 +111,13 @@ class sdistTestCase(PyPIRCCommandTestCase):
def test_make_distribution(self): def test_make_distribution(self):
self._init_tmp_pkg() # check if tar and gzip are installed
if (find_executable('tar') is None or
# check if tar is installed under win32 find_executable('gzip') is None):
if sys.platform == 'win32':
try:
spawn('tar --help')
except DistutilsExecError:
# let's return, no need to go further
return return
self._init_tmp_pkg()
# now building a sdist # now building a sdist
dist = Distribution() dist = Distribution()
dist.script_name = 'setup.py' dist.script_name = 'setup.py'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment