[Python-checkins] python/nondist/sandbox/setuptools/setuptools/tests init.py, 1.2, 1.3

Sun Mar 21 20:12:34 EST 2004

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10308/setuptools/tests
Modified Files:
	__init__.py 
Log Message:
Compute command line that should be passed to child setup scripts.
Warn user if unsupported options are supplied, and cancel unless
'depends -i' (aka '--ignore-extra-args') was used.
Index: __init__.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/tests/__init__.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** __init__.py	20 Mar 2004 20:52:12 -0000	1.2
--- __init__.py	22 Mar 2004 01:12:31 -0000	1.3
***************
*** 128,132 ****
 dist = makeSetup(
 extra_path='spam',
! script_args=['install','--install-lib',path1]
 )
 
--- 128,135 ----
 dist = makeSetup(
 extra_path='spam',
! script_args=[
! 'install','--install-lib',path1, '--prefix',path2,
! 'build','--compiler=mingw32', 
! ]
 )
 
***************
*** 137,150 ****
 self.assertEqual(cmd.search_path, [path2,path1]+sys.path)
 
! 
! 
! 
! 
! 
! 
! 
! 
! 
! 
 
 
--- 140,150 ----
 self.assertEqual(cmd.search_path, [path2,path1]+sys.path)
 
! self.assertEqual(cmd.unsafe_options,
! {'install':['--install-lib',path1]}
! )
! self.assertEqual(cmd.safe_options, {
! 'build':['--compiler','mingw32'],
! 'install':['--prefix',os.path.abspath(path2)]
! })
 
 
***************
*** 173,176 ****
--- 173,180 ----
 py_modules=['b.d','x'],
 ext_modules = (self.e1, self.e2),
+ script_args = [
+ 'build', '-q', 'build_ext', '-i',
+ 'install', '--prefix=/usr/lib', '--install-lib','/test'
+ ],
 package_dir = {},
 )
***************
*** 200,207 ****
 
 
- 
- 
- 
- 
 def testIncludeExclude(self):
 # remove an extension
--- 204,207 ----
***************
*** 272,281 ****
 )
 
! 
! 
! 
! 
! 
! 
 
 
--- 272,281 ----
 )
 
! def testCmdLineOpts(self):
! self.assertEqual(self.dist.get_cmdline_options(),
! { 'install':{'prefix':'/usr/lib', 'install-lib':'/test'},
! 'build': {'quiet':None}, 'build_ext':{'inplace':None},
! }
! )

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/tests __init__.py, 1.2, 1.3

[Python-checkins] python/nondist/sandbox/setuptools/setuptools/tests init.py, 1.2, 1.3