Author: dyung Date: Thu Dec 8 11:27:20 2016 New Revision: 289075 URL: http://llvm.org/viewvc/llvm-project?rev=289075&view=rev Log: Fixing test to work when the compiler defaults to a different C++ standard version.
Differential Revision: https://reviews.llvm.org/D27488 Modified: cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp Modified: cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp?rev=289075&r1=289074&r2=289075&view=diff ============================================================================== --- cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp (original) +++ cfe/trunk/test/OpenMP/teams_distribute_simd_collapse_messages.cpp Thu Dec 8 11:27:20 2016 @@ -1,8 +1,13 @@ // RUN: %clang_cc1 -verify -fopenmp %s +// RUN: %clang_cc1 -verify -fopenmp -std=c++98 %s +// RUN: %clang_cc1 -verify -fopenmp -std=c++11 %s void foo() { } +#if __cplusplus >= 201103L +// expected-note@+2 4 {{declared here}} +#endif bool foobool(int argc) { return argc; } @@ -50,9 +55,12 @@ T tmain(T argc, S **argv) { //expected-n for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; // expected-error 2 {{expected 2 for loops after '#pragma omp teams distribute simd', but found only 1}} -// expected-error@+4 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+3 2 {{argument to 'collapse' clause must be a strictly positive integer value}} -// expected-error@+2 2 {{expression is not an integral constant expression}} +// expected-error@+7 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+6 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +// expected-error@+5 2 {{expression is not an integral constant expression}} +#if __cplusplus >= 201103L +// expected-note@+3 2 {{non-constexpr function 'foobool' cannot be used in a constant expression}} +#endif #pragma omp target #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = ST; i < N; i++) @@ -62,7 +70,11 @@ T tmain(T argc, S **argv) { //expected-n for (int i = ST; i < N; i++) argv[0][i] = argv[0][i] - argv[0][i-ST]; -// expected-error@+2 2 {{expression is not an integral constant expression}} +#if __cplusplus <= 199711L + // expected-error@+5 2 {{expression is not an integral constant expression}} +#else + // expected-error@+3 2 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} +#endif #pragma omp target #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = ST; i < N; i++) @@ -110,14 +122,20 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; // expected-error {{expected 4 for loops after '#pragma omp teams distribute simd', but found only 1}} +#if __cplusplus >= 201103L + // expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} +#endif #pragma omp target #pragma omp teams distribute simd collapse (foobool(1) > 0 ? 1 : 2) // expected-error {{expression is not an integral constant expression}} for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -// expected-error@+4 {{expression is not an integral constant expression}} -// expected-error@+3 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} -// expected-error@+2 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +// expected-error@+7 {{expression is not an integral constant expression}} +// expected-error@+6 2 {{directive '#pragma omp teams distribute simd' cannot contain more than one 'collapse' clause}} +// expected-error@+5 2 {{argument to 'collapse' clause must be a strictly positive integer value}} +#if __cplusplus >= 201103L +// expected-note@+3 {{non-constexpr function 'foobool' cannot be used in a constant expression}} +#endif #pragma omp target #pragma omp teams distribute simd collapse (foobool(argc)), collapse (true), collapse (-5) for (int i = 4; i < 12; i++) @@ -128,7 +146,11 @@ int main(int argc, char **argv) { for (int i = 4; i < 12; i++) argv[0][i] = argv[0][i] - argv[0][i-4]; -// expected-error@+2 {{expression is not an integral constant expression}} +#if __cplusplus >= 201103L + // expected-error@+5 {{integral constant expression must have integral or unscoped enumeration type, not 'char *'}} +#else + // expected-error@+3 {{expression is not an integral constant expression}} +#endif #pragma omp target #pragma omp teams distribute simd collapse (argv[1]=2) // expected-error {{expected ')'}} expected-note {{to match this '('}} for (int i = 4; i < 12; i++) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
