From 66846897a5e026928502a1ef452bc4aa0c039105 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tarek=20Ziad=C3=A9?= Date: Tue, 22 Sep 2009 10:14:51 +0000 Subject: [PATCH] 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 (Tue, 22 Sep 2009) | 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 (Tue, 15 Sep 2009) | 3 lines Update distutils.util tests after my changes to --with-universal-archs ........ ................ --- Lib/distutils/tests/test_util.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py index c0acf5f481..795edb8cdc 100644 --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -115,15 +115,35 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): '-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) ' -- 2.40.0