diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-02-10 07:45:43 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-02-10 07:45:43 +0000 |
| commit | 476c4db3dc56bee43df384704c75ccc71cfa7a1d (patch) | |
| tree | 5d0dcec3cc12fc53532fc84029892b98711a2596 /test/asan/Unit | |
| parent | ca9211ecdede9bdedb812b2243a4abdb8dacd1b9 (diff) | |
| download | src-476c4db3dc56bee43df384704c75ccc71cfa7a1d.tar.gz src-476c4db3dc56bee43df384704c75ccc71cfa7a1d.zip | |
Import compiler-rt trunk r228651.vendor/compiler-rt/compiler-rt-r228651
Notes
Notes:
svn path=/vendor/compiler-rt/dist/; revision=278497
svn path=/vendor/compiler-rt/compiler-rt-r228651/; revision=278498; tag=vendor/compiler-rt/compiler-rt-r228651
Diffstat (limited to 'test/asan/Unit')
| -rw-r--r-- | test/asan/Unit/lit.site.cfg.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/asan/Unit/lit.site.cfg.in b/test/asan/Unit/lit.site.cfg.in index 1791b6b05b1c..b5991023ee8a 100644 --- a/test/asan/Unit/lit.site.cfg.in +++ b/test/asan/Unit/lit.site.cfg.in @@ -8,7 +8,7 @@ lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/unittests/lit.common.un def push_ld_library_path(config, new_path): new_ld_library_path = os.path.pathsep.join( - (new_path, config.environment['LD_LIBRARY_PATH'])) + (new_path, config.environment.get('LD_LIBRARY_PATH', ''))) config.environment['LD_LIBRARY_PATH'] = new_ld_library_path # Setup config name. @@ -17,7 +17,13 @@ config.name = 'AddressSanitizer-Unit' # Setup test source and exec root. For unit tests, we define # it as build directory with ASan unit tests. # FIXME: De-hardcode this path. -config.test_exec_root = "@COMPILER_RT_BINARY_DIR@/lib/asan/tests" +if @ASAN_TEST_DYNAMIC@: + test_dir = "dynamic" +else: + test_dir = "default" +config.test_exec_root = os.path.join("@COMPILER_RT_BINARY_DIR@", + "lib", "asan", "tests", test_dir) + config.test_source_root = config.test_exec_root # Set LD_LIBRARY_PATH to pick dynamic runtime up properly. |