Message ID | CAH6eHdQaAOUk12y7R8O9dsCvMsGHr_3=ppOiB1Ky-5_fmrhWEQ@mail.gmail.com |
---|---|
State | New |
Headers | show |
On Thu, Dec 8, 2016 at 10:03 AM, Jonathan Wakely <jwakely.gcc@gmail.com> wrote: > On 8 December 2016 at 17:09, David Edelsohn wrote: >> Jonathan, >> >> I'm seeing a new failure on AIX. >> >> FAIL: 25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc >> (test for excess errors) >> Excess errors: >> xg++: error: libgomp.spec: No such file or directory >> >> Does the testsuite driver assume that libgomp.spec already is >> installed in the correct install location? > > Ah, I think the DG directives are in the wrong order. > > Does this help? > > --- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc > +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc > @@ -1,6 +1,6 @@ > -// { dg-require-parallel-mode "" } > // { dg-options "-fopenmp -D_GLIBCXX_PARALLEL" { target *-*-* } } > // { dg-do run } > +// { dg-require-parallel-mode "" } > > // Copyright (C) 2016 Free Software Foundation, Inc. > // Placing the dg-do run directive first fixes the problem. That is what I committed. Thanks, David
On 08/12/16 14:41 -0800, David Edelsohn wrote: >On Thu, Dec 8, 2016 at 10:03 AM, Jonathan Wakely <jwakely.gcc@gmail.com> wrote: >> On 8 December 2016 at 17:09, David Edelsohn wrote: >>> Jonathan, >>> >>> I'm seeing a new failure on AIX. >>> >>> FAIL: 25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc >>> (test for excess errors) >>> Excess errors: >>> xg++: error: libgomp.spec: No such file or directory >>> >>> Does the testsuite driver assume that libgomp.spec already is >>> installed in the correct install location? >> >> Ah, I think the DG directives are in the wrong order. >> >> Does this help? >> >> --- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc >> +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc >> @@ -1,6 +1,6 @@ >> -// { dg-require-parallel-mode "" } >> // { dg-options "-fopenmp -D_GLIBCXX_PARALLEL" { target *-*-* } } >> // { dg-do run } >> +// { dg-require-parallel-mode "" } >> >> // Copyright (C) 2016 Free Software Foundation, Inc. >> // > >Placing the dg-do run directive first fixes the problem. That is what >I committed. > >Thanks, David I've committed that to gcc-6-branch too. FTR the tests were passing for me because an installed omp.h was being found somewhere, so the dg-require-parallel-mode check passed. With the change it only passes when "make check-parallel" is used, rather than "make check", because that adds -I../libgomp to the CXXFLAGS for the tests.
--- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc +++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc @@ -1,6 +1,6 @@ -// { dg-require-parallel-mode "" } // { dg-options "-fopenmp -D_GLIBCXX_PARALLEL" { target *-*-* } } // { dg-do run } +// { dg-require-parallel-mode "" } // Copyright (C) 2016 Free Software Foundation, Inc. //