[Openmp-commits] [PATCH] D48888: Removed "--no-as-needed" flag from OMPT tests to avoid failures on OSX

[Simone via Phabricator via Openmp-commits]

simoatze updated this revision to Diff 153965.
simoatze edited the summary of this revision.
simoatze added a comment.

I updated the patch and the description.
I have no way at this moment to test it on Windows, is the "--no-as-needed" flag supported?


Repository:
  rOMP OpenMP

https://reviews.llvm.org/D48888

Files:
  runtime/test/lit.cfg
  runtime/test/ompt/loadtool/tool_available/tool_available.c
  runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c


Index: runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c
===================================================================
--- runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c
+++ runtime/test/ompt/loadtool/tool_not_available/tool_not_available.c
@@ -7,9 +7,9 @@
 // RUN: %clang %flags -DTOOL -shared -fPIC %s -o %T/tool.so
 // 2. "introducing a dynamically-linked library that includes the tool’s definition of ompt_start_tool into the application’s address space"
 // 2.1 Link with tool during compilation
-// RUN: %libomp-compile -DCODE -Wl,--no-as-needed %T/tool.so && %libomp-run | FileCheck %s
+// RUN: %libomp-compile -DCODE %no-as-needed-flag %T/tool.so && %libomp-run | FileCheck %s
 // 2.2 Link with tool during compilation, but AFTER the runtime
-// RUN: %libomp-compile -DCODE -lomp -Wl,--no-as-needed %T/tool.so && %libomp-run | FileCheck %s
+// RUN: %libomp-compile -DCODE -lomp %no-as-needed-flag %T/tool.so && %libomp-run | FileCheck %s
 // 2.3 Inject tool via the dynamic loader
 // RUN: %libomp-compile -DCODE && %preload-tool %libomp-run | FileCheck %s
 
Index: runtime/test/ompt/loadtool/tool_available/tool_available.c
===================================================================
--- runtime/test/ompt/loadtool/tool_available/tool_available.c
+++ runtime/test/ompt/loadtool/tool_available/tool_available.c
@@ -7,9 +7,9 @@
 // RUN: %clang %flags -DTOOL -shared -fPIC %s -o %T/tool.so
 // 2. "introducing a dynamically-linked library that includes the tool’s definition of ompt_start_tool into the application’s address space"
 // 2.1 Link with tool during compilation
-// RUN: %libomp-compile -DCODE -Wl,--no-as-needed %T/tool.so && %libomp-run | FileCheck %s
+// RUN: %libomp-compile -DCODE %no-as-needed-flag %T/tool.so && %libomp-run | FileCheck %s
 // 2.2 Link with tool during compilation, but AFTER the runtime
-// RUN: %libomp-compile -DCODE -lomp -Wl,--no-as-needed %T/tool.so && %libomp-run | FileCheck %s
+// RUN: %libomp-compile -DCODE -lomp %no-as-needed-flag %T/tool.so && %libomp-run | FileCheck %s
 // 2.3 Inject tool via the dynamic loader
 // RUN: %libomp-compile -DCODE && %preload-tool %libomp-run | FileCheck %s
 
Index: runtime/test/lit.cfg
===================================================================
--- runtime/test/lit.cfg
+++ runtime/test/lit.cfg
@@ -120,7 +120,11 @@
     if config.operating_system == 'Windows':
         # No such environment variable on Windows.
         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"))
+        # 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(("%no-as-needed-flag", "-Wl,--no-as-needed"))


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48888.153965.patch
Type: text/x-patch
Size: 3050 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20180703/0b9455db/attachment.bin>