[Python-checkins] r75014 - in python/branches/release31-maint: Lib/distutils/tests/test_util.py

Tue Sep 22 12:14:51 CEST 2009

Author: tarek.ziade
Date: Tue Sep 22 12:14:51 2009
New Revision: 75014
Log:
Merged revisions 75013 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r75013 | tarek.ziade | 2009年09月22日 12:08:13 +0200 (2009年9月22日) | 10 lines
 
 Merged revisions 74812 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r74812 | ronald.oussoren | 2009年09月15日 23:24:07 +0200 (2009年9月15日) | 3 lines
 
 Update distutils.util tests after my changes
 to --with-universal-archs
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/distutils/tests/test_util.py
Modified: python/branches/release31-maint/Lib/distutils/tests/test_util.py
==============================================================================

--- python/branches/release31-maint/Lib/distutils/tests/test_util.py	(original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_util.py	Tue Sep 22 12:14:51 2009
@@ -115,15 +115,35 @@
 '-fno-strict-aliasing -fno-common '
 '-dynamic -DNDEBUG -g -O3')
 
+ self.assertEquals(get_platform(), 'macosx-10.4-intel')
+
+ get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc -arch i386 -isysroot '
+ '/Developer/SDKs/MacOSX10.4u.sdk '
+ '-fno-strict-aliasing -fno-common '
+ '-dynamic -DNDEBUG -g -O3')
+ self.assertEquals(get_platform(), 'macosx-10.4-fat3')
+
+ get_config_vars()['CFLAGS'] = ('-arch ppc64 -arch x86_64 -arch ppc -arch i386 -isysroot '
+ '/Developer/SDKs/MacOSX10.4u.sdk '
+ '-fno-strict-aliasing -fno-common '
+ '-dynamic -DNDEBUG -g -O3')
 self.assertEquals(get_platform(), 'macosx-10.4-universal')
 
- get_config_vars()['CFLAGS'] = ('-arch x86_64 -isysroot '
+ get_config_vars()['CFLAGS'] = ('-arch x86_64 -arch ppc64 -isysroot '
 '/Developer/SDKs/MacOSX10.4u.sdk '
 '-fno-strict-aliasing -fno-common '
 '-dynamic -DNDEBUG -g -O3')
 
 self.assertEquals(get_platform(), 'macosx-10.4-fat64')
 
+ for arch in ('ppc', 'i386', 'x86_64', 'ppc64'):
+ get_config_vars()['CFLAGS'] = ('-arch %s -isysroot '
+ '/Developer/SDKs/MacOSX10.4u.sdk '
+ '-fno-strict-aliasing -fno-common '
+ '-dynamic -DNDEBUG -g -O3'%(arch,))
+
+ self.assertEquals(get_platform(), 'macosx-10.4-%s'%(arch,))
+
 # linux debian sarge
 os.name = 'posix'
 sys.version = ('2.3.5 (#1, Jul 4 2007, 17:28:59) '
