diff options
Diffstat (limited to 'openmp')
| -rw-r--r-- | openmp/runtime/test/lit.cfg | 4 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/loadtool/tool_available.c (renamed from openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c) | 0 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/loadtool/tool_available_search.c (renamed from openmp/runtime/test/ompt/loadtool/tool_available_search/tool_available_search.c) | 0 | ||||
| -rw-r--r-- | openmp/runtime/test/ompt/loadtool/tool_not_available.c (renamed from openmp/runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c) | 0 | ||||
| -rw-r--r-- | openmp/tools/archer/tests/lit.cfg | 7 |
5 files changed, 2 insertions, 9 deletions
diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg index ca32985..4a5aff2 100644 --- a/openmp/runtime/test/lit.cfg +++ b/openmp/runtime/test/lit.cfg @@ -217,11 +217,11 @@ if config.has_ompt: config.substitutions.append(("%preload-tool", "true ||")) config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed")) elif config.operating_system == 'Darwin': - config.substitutions.append(("%preload-tool", "env DYLD_INSERT_LIBRARIES=%T/tool.so")) + config.substitutions.append(("%preload-tool", "env DYLD_INSERT_LIBRARIES=%t.tool_dir/tool.so")) # No such linker flag on Darwin. config.substitutions.append(("%no-as-needed-flag", "")) else: - config.substitutions.append(("%preload-tool", "env LD_PRELOAD=%T/tool.so")) + config.substitutions.append(("%preload-tool", "env LD_PRELOAD=%t.tool_dir/tool.so")) config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed")) else: config.substitutions.append(("FileCheck", config.test_filecheck)) diff --git a/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c b/openmp/runtime/test/ompt/loadtool/tool_available.c index a08581b..a08581b 100644 --- a/openmp/runtime/test/ompt/loadtool/tool_available/tool_available.c +++ b/openmp/runtime/test/ompt/loadtool/tool_available.c diff --git a/openmp/runtime/test/ompt/loadtool/tool_available_search/tool_available_search.c b/openmp/runtime/test/ompt/loadtool/tool_available_search.c index 73e2dea..73e2dea 100644 --- a/openmp/runtime/test/ompt/loadtool/tool_available_search/tool_available_search.c +++ b/openmp/runtime/test/ompt/loadtool/tool_available_search.c diff --git a/openmp/runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c b/openmp/runtime/test/ompt/loadtool/tool_not_available.c index df56d31..df56d31 100644 --- a/openmp/runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c +++ b/openmp/runtime/test/ompt/loadtool/tool_not_available.c diff --git a/openmp/tools/archer/tests/lit.cfg b/openmp/tools/archer/tests/lit.cfg index c4bae61..786b2d9 100644 --- a/openmp/tools/archer/tests/lit.cfg +++ b/openmp/tools/archer/tests/lit.cfg @@ -130,10 +130,3 @@ config.substitutions.append(("%deflake", os.path.join(os.path.dirname(__file__), config.substitutions.append(("FileCheck", config.test_filecheck)) config.substitutions.append(("%not", config.test_not)) config.substitutions.append(("%sort-threads", "sort --numeric-sort --stable")) -if config.operating_system == 'Windows': - # No such environment variable on Windows. - config.substitutions.append(("%preload-tool", "true ||")) -elif config.operating_system == 'Darwin': - config.substitutions.append(("%preload-tool", "env DYLD_INSERT_LIBRARIES=%T/tool.so")) -else: - config.substitutions.append(("%preload-tool", "env LD_PRELOAD=%T/tool.so")) |