OK.
On Fri, Dec 15, 2017 at 4:06 AM, Tom de Vries <tom_devr...@mentor.com> wrote:
> [ was: Re: [PATCH, PR81844] Fix condition folding in c_parser_omp_for_loop ]
>
> On 09/14/2017 09:38 PM, Jakub Jelinek wrote:
>>
>> On Thu, Sep 14, 2017 at 07:34:14PM +0000, de Vries, Tom wrote:
>>
>>> --- a/libgomp/testsuite/libgomp.c++/c++.exp
>>> +++ b/libgomp/testsuite/libgomp.c++/c++.exp
>>> @@ -22,6 +22,11 @@ dg-init
>>> # Turn on OpenMP.
>>> lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
>>> +# Switch into C++ mode. Otherwise, the libgomp.c-c++-common/*.c
>>> +# files would be compiled as C files.
>>> +set SAVE_GCC_UNDER_TEST "$GCC_UNDER_TEST"
>>> +set GCC_UNDER_TEST "$GCC_UNDER_TEST -x c++"
>>> +
>>> set blddir [lookfor_file [get_multilibs] libgomp]
>>> @@ -47,7 +52,9 @@ if { $blddir != "" } {
>>> if { $lang_test_file_found } {
>>> # Gather a list of all tests.
>>> - set tests [lsort [find $srcdir/$subdir *.C]]
>>> + set tests [lsort [concat \
>>> + [find $srcdir/$subdir *.C] \
>>> + [find $srcdir/$subdir/../libgomp.c-c++-common
>>> *.c]]]
>>> if { $blddir != "" } {
>>> set ld_library_path
>>> "$always_ld_library_path:${blddir}/${lang_library_path}"
>>
>>
>> I don't see SAVE_GCC_UNDER_TEST being used anywhere after it is set.
>> Did you mean to set GCC_UNDER_TEST back to SAVE_GCC_UNDER_TEST at the end
>> of
>> c++.exp?
>> libgomp.oacc-c++/c++.exp has:
>> # See above.
>> set GCC_UNDER_TEST "$SAVE_GCC_UNDER_TEST"
>>
>> Otherwise LGTM, thanks.
>
>
> Hi,
>
> now that we have libgomp.c-c++-common, this patch moves tests from libgomp.c
> to libgomp.c-c++-common and removes the corresponding libgomp.c++ tests that
> have been made redundant.
>
> Tested on x86_64, no issues found.
>
> OK for trunk?
>
> Thanks,
> - Tom
>
> [ For reference, the git commit output related to renaming:
>
> rename {libgomp.c => libgomp.c-c++-common}/atomic-18.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/cancel-taskgroup-2.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/for-1.c (82%)
> rename {libgomp.c => libgomp.c-c++-common}/for-1.h (100%)
> rename {libgomp.c => libgomp.c-c++-common}/for-2.c (87%)
> rename {libgomp.c => libgomp.c-c++-common}/for-2.h (100%)
> rename {libgomp.c => libgomp.c-c++-common}/for-3.c (95%)
> rename {libgomp.c => libgomp.c-c++-common}/for-4.c (84%)
> rename {libgomp.c => libgomp.c-c++-common}/for-5.c (96%)
> rename {libgomp.c => libgomp.c-c++-common}/for-6.c (95%)
> rename {libgomp.c => libgomp.c-c++-common}/loop-13.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/loop-14.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/loop-15.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/monotonic-1.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/monotonic-2.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/nonmonotonic-1.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/nonmonotonic-2.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/ordered-4.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr45784.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr64824.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr64868.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-1.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-2.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-3.c (96%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-4.c (97%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-5.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-6.c (96%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-7.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-8.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr66199-9.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/pr69389.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/simd-14.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/simd-15.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/simd-16.c (96%)
> rename {libgomp.c => libgomp.c-c++-common}/simd-17.c (96%)
> rename {libgomp.c => libgomp.c-c++-common}/target-1.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/target-10.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/target-13.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/target-2.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/taskgroup-1.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/taskloop-1.c (89%)
> rename {libgomp.c => libgomp.c-c++-common}/taskloop-2.c (97%)
> rename {libgomp.c => libgomp.c-c++-common}/taskloop-3.c (95%)
> rename {libgomp.c => libgomp.c-c++-common}/taskloop-4.c (100%)
> rename {libgomp.c => libgomp.c-c++-common}/udr-1.c (100%)
> ]
