diff options
| author | Matt Kopec <Matt.Kopec@intel.com> | 2013-02-20 20:54:10 +0000 |
|---|---|---|
| committer | Matt Kopec <Matt.Kopec@intel.com> | 2013-02-20 20:54:10 +0000 |
| commit | 93ee88179ba4831a162eb36e4e79d53cfe2ec4eb (patch) | |
| tree | ab55262a7129c186cd4e99e7ff70f35b02321e3c /lldb/test/api/check_public_api_headers | |
| parent | c6cbecc2c7ff32117a4ea4d30dfb62e95d45978b (diff) | |
| download | bcm5719-llvm-93ee88179ba4831a162eb36e4e79d53cfe2ec4eb.tar.gz bcm5719-llvm-93ee88179ba4831a162eb36e4e79d53cfe2ec4eb.zip | |
Fix TestPublicAPIHeaders test on Linux.
-Change the build_dir variable name to lib_dir
-Set lib_dir to the correct location on Linux
-Set LD_EXTRAS to the actual lldb library
llvm-svn: 175664
Diffstat (limited to 'lldb/test/api/check_public_api_headers')
| -rw-r--r-- | lldb/test/api/check_public_api_headers/Makefile | 2 | ||||
| -rw-r--r-- | lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lldb/test/api/check_public_api_headers/Makefile b/lldb/test/api/check_public_api_headers/Makefile index c66dd7306c0..d94e77c140b 100644 --- a/lldb/test/api/check_public_api_headers/Makefile +++ b/lldb/test/api/check_public_api_headers/Makefile @@ -6,7 +6,7 @@ MY_OS = $(shell uname -s) ifeq "$(MY_OS)" "Darwin" LD_EXTRAS ?= -framework LLDB else - LD_EXTRAS ?= $(LLDB_BUILD_DIR)/_lldb.so + LD_EXTRAS ?= $(LLDB_LIB_DIR)/liblldb.so endif # Example dictionary to pass to the Python build method: diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py index b7a91069c72..64f4f7a8ad5 100644 --- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py +++ b/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py @@ -14,7 +14,7 @@ class SBDirCheckerCase(TestBase): def setUp(self): TestBase.setUp(self) - self.build_dir = os.environ["LLDB_BUILD_DIR"] + self.lib_dir = os.environ["LLDB_LIB_DIR"] self.template = 'main.cpp.template' self.source = 'main.cpp' @@ -28,7 +28,7 @@ class SBDirCheckerCase(TestBase): self.generate_main_cpp() if sys.platform.startswith("darwin"): - d = {'FRAMEWORK_INCLUDES' : "-F%s" % self.build_dir} + d = {'FRAMEWORK_INCLUDES' : "-F%s" % self.lib_dir} if sys.platform.startswith("linux") or os.environ.get('LLDB_BUILD_TYPE') == 'Makefile': d = {'FRAMEWORK_INCLUDES' : "-I%s" % os.path.join(os.environ["LLDB_SRC"], "include")} self.buildDefault(dictionary=d) @@ -71,10 +71,10 @@ class SBDirCheckerCase(TestBase): if sys.platform.startswith("darwin"): env_var = 'DYLD_FRAMEWORK_PATH' - env_val = self.build_dir + env_val = self.lib_dir if sys.platform.startswith("linux"): env_var = 'LD_LIBRARY_PATH' - env_val = self.build_dir + env_val = self.lib_dir env_cmd = "settings set target.env-vars %s=%s" %(env_var, env_val) if self.TraceOn(): |
