mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-30 04:47:28 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
# HG changeset patch
|
|
# User Armin Rigo <arigo@tunes.org>
|
|
# Date 1433182838 -7200
|
|
# Node ID 34d5fd98bc84d202dd6692906f21509bb5abefaf
|
|
# Parent feea0af4a450e0ff0045f1b7c0a5f430c97520f9
|
|
Issue #204: second try
|
|
|
|
diff --git a/testing/cffi1/test_zdist.py b/testing/cffi1/test_zdist.py
|
|
--- a/testing/cffi1/test_zdist.py
|
|
+++ b/testing/cffi1/test_zdist.py
|
|
@@ -29,13 +29,17 @@
|
|
if hasattr(self, 'saved_cwd'):
|
|
os.chdir(self.saved_cwd)
|
|
|
|
- def run(self, args):
|
|
+ def run(self, args, cwd=None):
|
|
env = os.environ.copy()
|
|
- newpath = self.rootdir
|
|
- if 'PYTHONPATH' in env:
|
|
- newpath += os.pathsep + env['PYTHONPATH']
|
|
- env['PYTHONPATH'] = newpath
|
|
- subprocess.check_call([self.executable] + args, env=env)
|
|
+ # a horrible hack to prevent distutils from finding ~/.pydistutils.cfg
|
|
+ # (there is the --no-user-cfg option, but not in Python 2.6...)
|
|
+ env['HOME'] = '/this/path/does/not/exist'
|
|
+ if cwd is None:
|
|
+ newpath = self.rootdir
|
|
+ if 'PYTHONPATH' in env:
|
|
+ newpath += os.pathsep + env['PYTHONPATH']
|
|
+ env['PYTHONPATH'] = newpath
|
|
+ subprocess.check_call([self.executable] + args, cwd=cwd, env=env)
|
|
|
|
def _prepare_setuptools(self):
|
|
if hasattr(TestDist, '_setuptools_ready'):
|
|
@@ -44,8 +48,7 @@
|
|
import setuptools
|
|
except ImportError:
|
|
py.test.skip("setuptools not found")
|
|
- subprocess.check_call([self.executable, 'setup.py', 'egg_info'],
|
|
- cwd=self.rootdir)
|
|
+ self.run(['setup.py', 'egg_info'], cwd=self.rootdir)
|
|
TestDist._setuptools_ready = True
|
|
|
|
def check_produced_files(self, content, curdir=None):
|