summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 2e34bbd78e7..68b55e76da7 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -2477,17 +2477,21 @@ class CppMapping(Mapping):
}[plugin]
def getEnv(self, process, current):
-
#
# On Windows, add the testcommon directories to the PATH
#
libPaths = []
if isinstance(platform, Windows):
- libPaths.append(self.getLibDir(process, current))
testcommon = os.path.join(self.path, "test", "Common")
libPaths.append(os.path.join(testcommon, self.getBuildDir("testcommon", current)))
#
+ # On most platforms, we also need to add the library directory to the library path environment variable.
+ #
+ if not isinstance(platform, Darwin):
+ libPaths.append(self.getLibDir(process, current))
+
+ #
# Add the test suite library directories to the platform library path environment variable.
#
if current.testcase: