[Mobies-commit] [commit] r4400 - in UDM/trunk: src/UdmPython tests/test_UdmPython

[ksmyth at svn.isis.vanderbilt.edu]

Author: ksmyth
Date: Mon Nov 20 11:12:23 2017
New Revision: 4400

Log:
Fix for different working directories

Modified:
   UDM/trunk/src/UdmPython/setup.py
   UDM/trunk/tests/test_UdmPython/udm_python_test.py

Modified: UDM/trunk/src/UdmPython/setup.py
==============================================================================
--- UDM/trunk/src/UdmPython/setup.py	Mon Nov 20 11:12:20 2017	(r4399)
+++ UDM/trunk/src/UdmPython/setup.py	Mon Nov 20 11:12:23 2017	(r4400)
@@ -12,6 +12,7 @@
 from setuptools.command.build_ext import build_ext
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
+os.chdir(this_dir)
 
 setup_args = dict(
     name='Udm',
@@ -50,7 +51,7 @@
             # If building against Python source, may also need:
             # \PCbuild\$(PlatformShortName)
             # \PCbuild
-            os.environ['INCLUDE'] = os.path.join(pythonbase, 'include') + ';' + os.path.join(os.path.dirname(os.path.abspath(__file__)), 'windows_compat')
+            os.environ['INCLUDE'] = os.path.join(pythonbase, 'include') + ';' + os.path.join(this_dir, 'windows_compat')
             # \PC
 
             import subprocess

Modified: UDM/trunk/tests/test_UdmPython/udm_python_test.py
==============================================================================
--- UDM/trunk/tests/test_UdmPython/udm_python_test.py	Mon Nov 20 11:12:20 2017	(r4399)
+++ UDM/trunk/tests/test_UdmPython/udm_python_test.py	Mon Nov 20 11:12:23 2017	(r4400)
@@ -3,6 +3,9 @@
 import os.path
 import unittest
 
+this_dir = os.path.dirname(os.path.abspath(__file__))
+os.chdir(this_dir)
+
 from sys import platform as _platform
 if _platform == "linux" or _platform == "linux2":
     #linux
@@ -136,7 +139,6 @@
             return
         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: