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

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

Revision: 1557
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1557&view=rev
Author:   roman_yakovenko
Date:     2009-01-11 19:18:50 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
updating enum tester

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-11 09:42:07 UTC (rev 1556)
+++ pyplusplus_dev/unittests/autoconfig.py	2009-01-11 19:18:50 UTC (rev 1557)
@@ -23,7 +23,6 @@
 import pygccxml
 
 compiler = pygccxml.utils.native_compiler.get_gccxml_compiler()
-compiler = "msvc71"
 print 'GCCXML configured to simulate compiler ', compiler
 gccxml_version = '__GCCXML_09__'
 class cxx_parsers_cfg:

Modified: pyplusplus_dev/unittests/ctypes_pof_tester.py
===================================================================
--- pyplusplus_dev/unittests/ctypes_pof_tester.py	2009-01-11 09:42:07 UTC (rev 1556)
+++ pyplusplus_dev/unittests/ctypes_pof_tester.py	2009-01-11 19:18:50 UTC (rev 1557)
@@ -31,11 +31,19 @@
 
     @property
     def symbols_file( self ):
-        return os.path.join( self.project_dir, 'binaries', self.base_name + '.map' )
+        ext = '.so'
+        prefix = 'lib'
+        if 'win32' in sys.platform:
+            prefix = ''
+            ext = '.map'
+        return os.path.join( self.project_dir, 'binaries', prefix + self.base_name + ext )
 
     @property
     def library_file( self ):
-        return os.path.join( self.project_dir, 'binaries', self.base_name + '.dll' )
+        if 'win32' in sys.platform:
+            return os.path.join( self.project_dir, 'binaries', self.base_name + '.dll' )
+        else:
+            return self.symbols_file
 
     def customize(self, mb ):
         pass
@@ -116,14 +124,18 @@
         mb.enums().include()
 
     def test(self):
-        pass
+        self.failUnless( self.module_ref.Chisla.nol == 0 )
+        self.failUnless( self.module_ref.Chisla.odin == 1 )
+        self.failUnless( self.module_ref.Chisla.dva == 2 )
+        self.failUnless( self.module_ref.Chisla.tri == 3 )
 
+
 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(enums_tester_t))
     return suite
 
 def run_suite():

Modified: pyplusplus_dev/unittests/sconstruct
===================================================================
--- pyplusplus_dev/unittests/sconstruct	2009-01-11 09:42:07 UTC (rev 1556)
+++ pyplusplus_dev/unittests/sconstruct	2009-01-11 19:18:50 UTC (rev 1557)
@@ -1,15 +1,17 @@
 import os
+import sys
 
 env = Environment()
 
-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'
-                         , r'E:\Program Files\Microsoft Visual Studio 9.0\VC\lib'] )
-    env.Append( CPPPATH=[r"E:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"
-                        , r"E:\Program Files\Microsoft Visual Studio 9.0\VC\include"])
+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'
+                             , r'E:\Program Files\Microsoft Visual Studio 9.0\VC\lib'] )
+        env.Append( CPPPATH=[r"E:\Program Files\Microsoft SDKs\Windows\v6.0A\Include"
+                            , r"E:\Program Files\Microsoft Visual Studio 9.0\VC\include"])
 
-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"] )
+    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"] )
 
 scripts = [ 'pof', 'issues', 'enums' ]
 for s in scripts:


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