[pygccxml-commit] SF.net SVN: pygccxml: [1134] pyplusplus_dev

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

Revision: 1134
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1134&view=rev
Author:   roman_yakovenko
Date:     2007-11-10 14:39:39 -0800 (Sat, 10 Nov 2007)

Log Message:
-----------
updating testers, adding multi process tests execution

Modified Paths:
--------------
    pyplusplus_dev/environment.py
    pyplusplus_dev/unittests/autoconfig.py
    pyplusplus_dev/unittests/data/member_variables_to_be_exported.hpp
    pyplusplus_dev/unittests/test_all.py

Modified: pyplusplus_dev/environment.py
===================================================================
--- pyplusplus_dev/environment.py	2007-11-10 22:37:12 UTC (rev 1133)
+++ pyplusplus_dev/environment.py	2007-11-10 22:39:39 UTC (rev 1134)
@@ -17,7 +17,9 @@
     gccxml_09_path = os.path.join( this_module_dir_path, '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
 
     gccxml_path = gccxml_09_path
-    gccxml_version = '__GCCXML_09__'
+    gccxml_version = '__GCCXML_07__'
+    if '0.9' in gccxml_version:
+        gccxml_version = '__GCCXML_09__'
 
     executable = gccxml_path
 

Modified: pyplusplus_dev/unittests/autoconfig.py
===================================================================
--- pyplusplus_dev/unittests/autoconfig.py	2007-11-10 22:37:12 UTC (rev 1133)
+++ pyplusplus_dev/unittests/autoconfig.py	2007-11-10 22:39:39 UTC (rev 1134)
@@ -46,13 +46,13 @@
 
 os.chdir( build_dir )
 
-if sys.platform == 'linux2':
-    LD_LIBRARY_PATH = 'LD_LIBRARY_PATH'
-    if not os.environ.has_key( LD_LIBRARY_PATH ) \
-       or not set( scons_config.libpath ).issubset( set( os.environ[LD_LIBRARY_PATH].split(':') ) ):
-        #see http://hathawaymix.org/Weblog/2004-12-30
-        print 'error: LD_LIBRARY_PATH has not been set'
-else:
+#~ if sys.platform == 'linux2':
+    #~ LD_LIBRARY_PATH = 'LD_LIBRARY_PATH'
+    #~ if not os.environ.has_key( LD_LIBRARY_PATH ) \
+       #~ or not set( scons_config.libpath ).issubset( set( os.environ[LD_LIBRARY_PATH].split(':') ) ):
+        #~ #see http://hathawaymix.org/Weblog/2004-12-30
+        #~ print 'error: LD_LIBRARY_PATH has not been set'
+if sys.platform == 'win32':
     PATH = os.environ.get( 'PATH', '' )
     PATH=PATH + ';' + ';'.join( scons_config.libpath )
     os.environ['PATH'] = PATH

Modified: pyplusplus_dev/unittests/data/member_variables_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/member_variables_to_be_exported.hpp	2007-11-10 22:37:12 UTC (rev 1133)
+++ pyplusplus_dev/unittests/data/member_variables_to_be_exported.hpp	2007-11-10 22:39:39 UTC (rev 1134)
@@ -34,7 +34,6 @@
     const color prefered_color;
     static int instance_count;
     static const color default_color;
-    static const point zero_point;
 };
 
 struct bit_fields_t{
@@ -153,4 +152,4 @@
 }
 
 }
-#endif//__member_variables_to_be_exported_hpp__
\ No newline at end of file
+#endif//__member_variables_to_be_exported_hpp__

Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py	2007-11-10 22:37:12 UTC (rev 1133)
+++ pyplusplus_dev/unittests/test_all.py	2007-11-10 22:39:39 UTC (rev 1134)
@@ -153,7 +153,8 @@
     class module_stat_t( object ):
         bottom_line_re = re.compile( 'Ran\s(?P<num_of_tests>\d+)\stests?\sin\s(?P<seconds>\d+\.?\d*)s')
         test_name_re = re.compile( '(?P<name>.+ \(.+\))\s\.\.\.' )
-        failed_test_re = re.compile( '(FAIL|ERROR)\:\s(?P<name>.+ \(.+\))' )
+        failed_test_re = re.compile( 'FAIL\:\s(?P<name>.+ \(.+\))' )
+        error_test_re = re.compile( 'ERROR\:\s(?P<name>.+ \(.+\))' )
         
         def __init__( self, module, output, exit_status ):
             self.module = module
@@ -178,6 +179,9 @@
             for match_found in self.failed_test_re.finditer( self.output ):
                 self.test_results[ match_found.group( 'name' ) ] = 'FAIL'
 
+            for match_found in self.error_test_re.finditer( self.output ):
+                self.test_results[ match_found.group( 'name' ) ] = 'ERROR'
+
             assert( self.num_of_tests == len( self.test_results ) )
 
     def __init__( self, modules ):


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