Apply OSX > 10.8 fix to system test scripts

Refs #10870
mantidproject · Feb 16, 2015 · dc21b4d · dc21b4d
1 parent 7078890
commit dc21b4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Code/Mantid/Testing/SystemTests/scripts/mantidinstaller.py b/Code/Mantid/Testing/SystemTests/scripts/mantidinstaller.py
@@ -229,7 +229,9 @@ class DMGInstaller(MantidInstaller):
     def __init__(self, package_dir, do_install):
         MantidInstaller.__init__(self, package_dir, 'mantid-*.dmg', do_install)
         self.mantidPlotPath = '/Applications/MantidPlot.app/Contents/MacOS/MantidPlot'
-        os.environ['DYLD_LIBRARY_PATH'] = '/Applications/MantidPlot.app/Contents/MacOS'
+        # only necessary on 10.8 build
+        if int(platform.release().split('.')[0]) < 13:
+            os.environ['DYLD_LIBRARY_PATH'] = '/Applications/MantidPlot.app/Contents/MacOS'
 
     def do_install(self):
         """Mounts the dmg and copies the application into the right place.

diff --git a/Code/Mantid/Testing/SystemTests/scripts/runSystemTests.py b/Code/Mantid/Testing/SystemTests/scripts/runSystemTests.py
@@ -78,7 +78,8 @@
 # not the dynamic library path variable name
 if platform.system() == 'Windows':
   path_var = "PATH"
-elif platform.system() == 'Darwin':
+# only necessary on 10.8 build
+elif platform.system() == 'Darwin' and int(platform.release().split('.')[0]) < 13 :
   path_var = "DYLD_LIBRARY_PATH"
 else:
   path_var = None