[Mobies-commit] [commit] r4309 - UDM/trunk/tests/test_UdmPython

[ksmyth at redhat3.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed Jul  9 11:53:36 2014
New Revision: 4309

Log:
Support running udm_python_test.py on x86 Windows

Modified:
   UDM/trunk/tests/test_UdmPython/udm_python_test.py

Modified: UDM/trunk/tests/test_UdmPython/udm_python_test.py
==============================================================================
--- UDM/trunk/tests/test_UdmPython/udm_python_test.py	Wed Jul  9 11:53:31 2014	(r4308)
+++ UDM/trunk/tests/test_UdmPython/udm_python_test.py	Wed Jul  9 11:53:36 2014	(r4309)
@@ -137,11 +137,12 @@
         import subprocess
         import os.path
         this_dir = os.path.dirname(os.path.abspath(__file__))
+        pf86 = os.environ.get('ProgramFiles(x86)', os.environ.get('ProgramFiles'))
         
         with open(os.path.join(this_dir, 'UdmDll_VS10.lib.exports'), 'wb') as out_file:
             env = dict(os.environ)
-            env['PATH'] += r';c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE'
-            subprocess.check_call([r'c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\dumpbin.exe', '/EXPORTS',
+            env['PATH'] += r';' + pf86 + r'\Microsoft Visual Studio 10.0\Common7\IDE'
+            subprocess.check_call([pf86 + r'\Microsoft Visual Studio 10.0\VC\bin\dumpbin.exe', '/EXPORTS',
                 os.path.join(this_dir, r'..\..\build\Win32\v100\Release\UdmDll_VS10.lib')], stdout=out_file, env=env)
         
         new_exports = {}