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

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

Revision: 1824
          http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1824&view=rev
Author:   roman_yakovenko
Date:     2010-01-31 09:02:08 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
porting tests to x86_64 architecture

Modified Paths:
--------------
    pyplusplus_dev/environment.py
    pyplusplus_dev/unittests/indexing_suites_v2_bug_tester.py

Modified: pyplusplus_dev/environment.py
===================================================================
--- pyplusplus_dev/environment.py	2010-01-31 08:02:15 UTC (rev 1823)
+++ pyplusplus_dev/environment.py	2010-01-31 09:02:08 UTC (rev 1824)
@@ -1,6 +1,7 @@
 import os
 import sys
 import getpass
+import platform
 
 this_module_dir_path = os.path.abspath ( os.path.dirname( sys.modules[__name__].__file__) )
 
@@ -16,11 +17,12 @@
     include = ''
 
 class gccxml:
-    gccxml_09_path = os.path.join( this_module_dir_path, '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
 
-    gccxml_path = gccxml_09_path
+    gccxml_path = os.path.join( this_module_dir_path, '..', 'gccxml_bin', 'v09', platform.system(), platform.machine(), 'bin' )
+    if not os.path.exists( gccxml_path ):
+        gccxml_path = os.path.join( this_module_dir_path, '..', 'gccxml_bin', 'v09', sys.platform, 'bin' )
+
     gccxml_version = '__GCCXML_09__'
-
     executable = gccxml_path
 
 class scons:
@@ -42,7 +44,7 @@
         print 'test process niceness: 20'
         scons.suffix = '.so'
         scons.ccflags = []
-        boost.libs = ['/home/roman/include/libs' ]
+        boost.libs = ['/home/roman/include/libs', '/home/roman/include/lib' ]
         boost.include = '/home/roman/boost_svn'
         python.include = '/usr/include/python2.6'
 elif 'root' == getpass.getuser():

Modified: pyplusplus_dev/unittests/indexing_suites_v2_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/indexing_suites_v2_bug_tester.py	2010-01-31 08:02:15 UTC (rev 1823)
+++ pyplusplus_dev/unittests/indexing_suites_v2_bug_tester.py	2010-01-31 09:02:08 UTC (rev 1824)
@@ -11,8 +11,12 @@
 from pyplusplus import code_creators
 
 if 'linux' in sys.platform:
-    import dl
-    sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL)
+    try:
+        from ctypes import RTLD_NOW, RTLD_GLOBAL
+    except ImportError:
+        RTLD_NOW = 2
+        RTLD_GLOBAL = 256
+    sys.setdlopenflags(RTLD_NOW | RTLD_GLOBAL)
 
 class tester_t(fundamental_tester_base.fundamental_tester_base_t):
     def __init__( self, *args ):


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