[openacc, testsuite] Allow installed testing of libgomp to find gomp-constants.h

[Tom de Vries]

[ was: Re: [PATCH, PR82428] Add 
__builtin_goacc_{gang,worker,vector}_{id,size} ]

On 05/03/2018 12:36 PM, Tom de Vries wrote:
> On 01/18/2018 09:55 AM, Tom de Vries wrote:
>> diff --git 
>> a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c 
>> b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
>> index 6de739a..e273a79 100644
>> --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
>> +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/gang-static-2.c
>> @@ -1,25 +1,23 @@
>> -/* { dg-do run { target openacc_nvidia_accel_selected } } */
>> -/* This code uses nvptx inline assembly guarded with acc_on_device, 
>> which is
>> -Â Â  not optimized away at -O0, and then confuses the target assembler.
>> -Â Â  { dg-skip-if "" { *-*-* } { "-O0" } { "" } } */
>> -
>> Â  #include <assert.h>
>> Â  #include <openacc.h>
>> +#include <gomp-constants.h>
> 
> Hi,
> 
> it seems I've broken installed testing of libgomp with this patch. The 
> compiler cannot find gomp-constants.h.
> 
> In the build-area testing setup, the compiler can find gomp-constants.h 
> because in libgomp.exp we find:
> ...
>  Â Â Â  if { $blddir != "" } {
>  Â Â Â Â Â Â Â  ...
>  Â Â Â Â Â Â Â  # The top-level include directory, for gomp-constants.h.
>  Â Â Â Â Â Â Â  lappend ALWAYS_CFLAGS "additional_flags=-I${srcdir}/../../include"
>  Â Â Â  }
> ...
> but this line is not active for installed testing.
> 
> Patch below fixes this.
> 
> Is this approach ok for trunk?
> 

Assuming no objections, committed as attached.

Thanks,
- Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-openacc-testsuite-Allow-installed-testing-of-libgomp-to-find-gomp-constants.h.patch
Type: text/x-patch
Size: 1236 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20180507/91b63914/attachment.bin>