On Wed, Dec 17, 2025 at 01:35:29PM +0100, Rainer Orth wrote:
> 2025-12-16 Rainer Orth <[email protected]>
>
> libgomp:
> PR c++/81337
> * testsuite/libgomp.c++/target-cdtor-2.output: New file.
> * testsuite/libgomp.c++/target-cdtor-2.C: Use it instead of
> dg-output. xfail on Solaris.
>
> # HG changeset patch
> # Parent f4cdb68b5dd6b74b9681e25a1f9f96916f9498ee
> libgomp: xfail libgomp.c++/target-cdtor-2.C on Solaris [PR81337]
>
> diff --git a/libgomp/testsuite/libgomp.c++/target-cdtor-2.C
> b/libgomp/testsuite/libgomp.c++/target-cdtor-2.C
> --- a/libgomp/testsuite/libgomp.c++/target-cdtor-2.C
> +++ b/libgomp/testsuite/libgomp.c++/target-cdtor-2.C
> @@ -114,32 +114,5 @@ int main()
> */
>
> /* Defined order in which 'constructor' functions, and 'destructor'
> functions are run, and C++ objects are constructed (..., and destructed in
> reverse order).
> - { dg-output {S, 3, 1[\r\n]+} }
> - { dg-output {S, -1, 1[\r\n]+} }
> - { dg-output {S, -1, 1[\r\n]+} }
> - { dg-output {S, 7, 1[\r\n]+} }
> - { dg-output {S, 5, 1[\r\n]+} }
> - { dg-output {initH1, 1[\r\n]+} }
> - { dg-output {initDH1, 1[\r\n]+} }
> - { dg-output {main:1, 1[\r\n]+} }
> - { dg-output {S, -1, 0[\r\n]+} { target offload_device } }
> - { dg-output {S, -1, 0[\r\n]+} { target offload_device } }
> - { dg-output {S, 5, 0[\r\n]+} { target offload_device } }
> - { dg-output {initDH1, 0[\r\n]+} { target offload_device } }
> - { dg-output {main:2, 1[\r\n]+} { target { ! offload_device } } }
> - { dg-output {main:2, 0[\r\n]+} { target offload_device } }
> - { dg-output {main:3, 1[\r\n]+} { target { ! offload_device } } }
> - { dg-output {main:3, 0[\r\n]+} { target offload_device } }
> - { dg-output {main:4, 1[\r\n]+} }
> - { dg-output {~S, 5, 0[\r\n]+} { target offload_device } }
> - { dg-output {~S, -1, 0[\r\n]+} { target offload_device } }
> - { dg-output {~S, -1, 0[\r\n]+} { target offload_device } }
> - { dg-output {finiDH1, 0[\r\n]+} { target offload_device } }
> - { dg-output {~S, 5, 1[\r\n]+} }
> - { dg-output {~S, 7, 1[\r\n]+} }
> - { dg-output {~S, -1, 1[\r\n]+} }
> - { dg-output {~S, -1, 1[\r\n]+} }
> - { dg-output {~S, 3, 1[\r\n]+} }
> - { dg-output {finiDH1, 1[\r\n]+} }
> - { dg-output {finiH1, 1[\r\n]+} }
> + { dg-output-file target-cdtor-2.output { xfail *-*-solaris2* } }
This looks wrong to me, the original dg-output has different effective
targets, but there is just one output file, so it will either fail
for offload_device, or fail without that.
Jakub
