[pygccxml-commit] SF.net SVN: pygccxml:[1577] pyplusplus_dev/unittests

[<rom...@us...>]

Revision: 1577
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1577&view=rev
Author:   roman_yakovenko
Date:     2009-01-15 08:57:39 +0000 (Thu, 15 Jan 2009)

Log Message:
-----------
making ctypes testers to work on windows with python 2.5 and visual studio 2003

Modified Paths:
--------------
    pyplusplus_dev/unittests/autoconfig.py
    pyplusplus_dev/unittests/ctypes_pof_tester.py
    pyplusplus_dev/unittests/sconstruct

Modified: pyplusplus_dev/unittests/autoconfig.py
===================================================================
--- pyplusplus_dev/unittests/autoconfig.py	2009-01-15 08:39:29 UTC (rev 1576)
+++ pyplusplus_dev/unittests/autoconfig.py	2009-01-15 08:57:39 UTC (rev 1577)
@@ -22,24 +22,22 @@
 
 import pygccxml
 
-compiler = pygccxml.utils.native_compiler.get_gccxml_compiler()
-print 'GCCXML configured to simulate compiler ', compiler
 gccxml_version = '__GCCXML_09__'
+
 class cxx_parsers_cfg:
-    keywd = { 'working_directory' : data_directory
-              , 'define_symbols' : [ gccxml_version ]
-              , 'compiler' : compiler
-              , 'gccxml_path': gccxml.executable }
+    gccxml = pygccxml.parser.load_gccxml_configuration( 'gccxml.cfg'
+                                                        , gccxml_path=gccxml.executable
+                                                        , working_directory=data_directory
+                                                        , compiler=pygccxml.utils.native_compiler.get_gccxml_compiler() )
 
+    gccxml.define_symbols.append( gccxml_version )
     if 'win' in sys.platform:
-        keywd['define_symbols'].append( '__PYGCCXML_%s__' % compiler.upper() )
-        if 'msvc9' == compiler:
-            keywd['define_symbols'].append( '_HAS_TR1=0' )
+        gccxml.define_symbols.append( '__PYGCCXML_%s__' % gccxml.compiler.upper() )
+        if 'msvc9' == gccxml.compiler:
+            gccxml.define_symbols.append( '_HAS_TR1=0' )
 
-    gccxml = pygccxml.parser.gccxml_configuration_t( **keywd )
+print 'GCCXML configured to simulate compiler ', cxx_parsers_cfg.gccxml.compiler
 
-
-
 class scons_config:
     libs = []
     libpath = [ python.libs ] + boost.libs

Modified: pyplusplus_dev/unittests/ctypes_pof_tester.py
===================================================================
--- pyplusplus_dev/unittests/ctypes_pof_tester.py	2009-01-15 08:39:29 UTC (rev 1576)
+++ pyplusplus_dev/unittests/ctypes_pof_tester.py	2009-01-15 08:57:39 UTC (rev 1577)
@@ -48,12 +48,17 @@
     def customize(self, mb ):
         pass
 
+    def __build_scons_cmd( self ):
+        cmd = autoconfig.scons.cmd_build + ' ' + self.base_name
+        if autoconfig.cxx_parsers_cfg.gccxml.compiler == 'msvc71':
+            cmd  = cmd + ' use_msvc71=True'
+        return cmd
+
     def setUp( self ):
         if self.base_name in sys.modules:
             return sys.modules[ self.base_name ]
-        #~ import pdb
-        #~ pdb.set_trace()
-        autoconfig.scons_config.compile( autoconfig.scons.cmd_build + ' ' + self.base_name )
+
+        autoconfig.scons_config.compile( self.__build_scons_cmd() )
         mb = ctypes_module_builder_t( [self.header], self.symbols_file, autoconfig.cxx_parsers_cfg.gccxml )
         self.customize( mb )
         mb.build_code_creator( self.library_file )
@@ -150,7 +155,7 @@
         self.failUnless( mb.global_ns.class_( 'io_marker_t' ).ignore == False )
 
     def test(self):
-        self.failUnless( mb.module_ref.io_marker_t )
+        self.failUnless( self.module_ref.io_marker_t )
 
 class anonymous_tester_t( ctypes_base_tester_t ):
     def __init__( self, *args, **keywd ):
@@ -166,12 +171,12 @@
 
 def create_suite():
     suite = unittest.TestSuite()
-    #~ if 'win' in sys.platform:
-        #~ suite.addTest( unittest.makeSuite(pof_tester_t))
-        #~ suite.addTest( unittest.makeSuite(issues_tester_t))
-    #~ suite.addTest( unittest.makeSuite(enums_tester_t))
-    #~ suite.addTest( unittest.makeSuite(opaque_tester_t))
-    #~ suite.addTest( unittest.makeSuite(include_algorithm_tester_t))
+    if 'win' in sys.platform:
+        suite.addTest( unittest.makeSuite(pof_tester_t))
+        suite.addTest( unittest.makeSuite(issues_tester_t))
+    suite.addTest( unittest.makeSuite(enums_tester_t))
+    suite.addTest( unittest.makeSuite(opaque_tester_t))
+    suite.addTest( unittest.makeSuite(include_algorithm_tester_t))
     suite.addTest( unittest.makeSuite(anonymous_tester_t))
     return suite
 

Modified: pyplusplus_dev/unittests/sconstruct
===================================================================
--- pyplusplus_dev/unittests/sconstruct	2009-01-15 08:39:29 UTC (rev 1576)
+++ pyplusplus_dev/unittests/sconstruct	2009-01-15 08:57:39 UTC (rev 1577)
@@ -1,8 +1,12 @@
 import os
 import sys
 
-env = Environment()
+opts = Options( "options.txt", ARGUMENTS )
 
+opts.Add( BoolOption( 'use_msvc71', 'use msvc71 compiler', False ) )
+
+env = Environment(options=opts)
+
 if 'win32' in sys.platform:
     if os.path.exists( r'E:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib' ):
         env.Append( LIBPATH=[ r'E:\Program Files\Microsoft SDKs\Windows\v6.0A\Lib'
@@ -13,6 +17,12 @@
     env.AppendUnique( CCFLAGS=[ r"/MD",r"/EHsc",r"/GR",r"/Zc:wchar_t",r"/Zc:forScope" ] )
     env.AppendUnique( LINKFLAGS=[r"/MAP:${TARGET.base}.map", r"/MAPINFO:EXPORTS"] )
 
+    if env[ 'use_msvc71' ]:
+        env['MSVS'] = {'VERSION': '7.1'}
+        env['MSVS_VERSION'] = '7.1'
+        Tool('msvc')(env)
+
+
 env.AppendUnique( CPPPATH=['#data'] )
 
 scripts = [ 'pof', 'issues', 'enums', 'opaque', 'include_algorithm', 'anonymous' ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.