Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit fe56c8f

Browse files
authoredMay 10, 2025
[OpenMP][test] Adjust tool_available_search.c for Solaris (#138515)
After PR #138514, only 3 testsuite failures remain on Solaris/amd64. One of them is ``` libomp :: ompt/loadtool/tool_available_search/tool_available_search.c ``` The issue is that the expected message is that emitted by Linux/glibc, while the Solaris message differs: On Linux/x86_64, I get ``` Opening projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so... Failed: projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so: cannot open shared object file: No such file or directory ``` while Solaris/amd64 emits ``` Opening projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so... Failed: ld.so.1: tool_available_search.c.tmp: projects/openmp/runtime/test/ompt/loadtool/tool_available_search/Output/non_existing_file.so: open failed: No such file or directory ``` Since the exact wording is obviously an implementation detail, this patch allows for both forms. Tested on `amd64-pc-solaris2.11` and `x86_64-pc-linux-gnu`.
1 parent 1b4f161 commit fe56c8f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

‎openmp/runtime/test/ompt/loadtool/tool_available_search/tool_available_search.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
// CHECK-SAME: [[PARENTPATH]]/second_tool.so
2727
// CHECK-SAME: [[PARENTPATH]]/third_tool.so
2828
// CHECK-NEXT: Opening [[PARENTPATH]]/non_existing_file.so... Failed:
29-
// CHECK-SAME: [[PARENTPATH]]/non_existing_file.so: cannot open shared object
30-
// CHECK-SAME: file: No such file or directory
29+
// CHECK-SAME: [[PARENTPATH]]/non_existing_file.so: {{cannot open shared object file|open failed}}:
30+
// CHECK-SAME: No such file or directory
3131
// CHECK-NEXT: Opening [[PARENTPATH]]/first_tool.so... Success.
3232
// CHECK-NEXT: Searching for ompt_start_tool in
3333
// CHECK-SAME: [[PARENTPATH]]/first_tool.so... Failed:
34-
// CHECK-SAME: [[PARENTPATH]]/first_tool.so: undefined symbol: ompt_start_tool
34+
// CHECK-SAME: {{.*/first_tool.so: undefined symbol: ompt_start_tool|ld.so.1: .*: ompt_start_tool: can't find symbol}}
3535
// CHECK-NEXT: Opening [[PARENTPATH]]/second_tool.so... Success.
3636
// CHECK-NEXT: Searching for ompt_start_tool in
3737
// CHECK-SAME: [[PARENTPATH]]/second_tool.so... 0: Do not initialize tool

0 commit comments

Comments
 (0)
Failed to load comments.