From b5512c66a7c63bdf2b0949444c7373141b9c0720 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Fri, 11 Oct 2013 12:43:15 +0200 Subject: [PATCH] lib-1.c (main): Add missing error check. libgomp/ * testsuite/libgomp.c/lib-1.c (main): Add missing error check. * testsuite/libgomp.fortran/lib1.f90: Likewise. * testsuite/libgomp.fortran/lib2.f: Likewise. * testsuite/libgomp.fortran/lib3.f: Likewise. From-SVN: r203420 --- libgomp/ChangeLog | 5 +++++ libgomp/testsuite/libgomp.c/lib-1.c | 2 ++ libgomp/testsuite/libgomp.fortran/lib1.f90 | 1 + libgomp/testsuite/libgomp.fortran/lib2.f | 1 + libgomp/testsuite/libgomp.fortran/lib3.f | 1 + 5 files changed, 10 insertions(+) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 8d4fb6cb499d..3788d673e128 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,5 +1,10 @@ 2013-10-11 Thomas Schwinge + * testsuite/libgomp.c/lib-1.c (main): Add missing error check. + * testsuite/libgomp.fortran/lib1.f90: Likewise. + * testsuite/libgomp.fortran/lib2.f: Likewise. + * testsuite/libgomp.fortran/lib3.f: Likewise. + * configure.ac: Typo fix. * configure: Regenerate. diff --git a/libgomp/testsuite/libgomp.c/lib-1.c b/libgomp/testsuite/libgomp.c/lib-1.c index 4839cf936f20..086036d0a699 100644 --- a/libgomp/testsuite/libgomp.c/lib-1.c +++ b/libgomp/testsuite/libgomp.c/lib-1.c @@ -85,6 +85,8 @@ main (void) l = ! omp_in_parallel (); #pragma omp parallel reduction (|:l) if (1) l = ! omp_in_parallel (); + if (l) + abort (); e = omp_get_wtime (); if (d > e) diff --git a/libgomp/testsuite/libgomp.fortran/lib1.f90 b/libgomp/testsuite/libgomp.fortran/lib1.f90 index 8840018674ad..e7e1c748a318 100644 --- a/libgomp/testsuite/libgomp.fortran/lib1.f90 +++ b/libgomp/testsuite/libgomp.fortran/lib1.f90 @@ -66,6 +66,7 @@ !$omp parallel reduction (.or.:l) if (.true.) l = .not. omp_in_parallel () !$omp end parallel + if (l) call abort e = omp_get_wtime () if (d .gt. e) call abort diff --git a/libgomp/testsuite/libgomp.fortran/lib2.f b/libgomp/testsuite/libgomp.fortran/lib2.f index 75510827043e..20db04a1c5f1 100644 --- a/libgomp/testsuite/libgomp.fortran/lib2.f +++ b/libgomp/testsuite/libgomp.fortran/lib2.f @@ -66,6 +66,7 @@ C$OMP END PARALLEL C$OMP PARALLEL REDUCTION (.OR.:L) IF (.TRUE.) L = .NOT. OMP_IN_PARALLEL () C$OMP END PARALLEL + IF (L) CALL ABORT E = OMP_GET_WTIME () IF (D .GT. E) CALL ABORT diff --git a/libgomp/testsuite/libgomp.fortran/lib3.f b/libgomp/testsuite/libgomp.fortran/lib3.f index fa7b227c0ef7..264a377e5ddd 100644 --- a/libgomp/testsuite/libgomp.fortran/lib3.f +++ b/libgomp/testsuite/libgomp.fortran/lib3.f @@ -66,6 +66,7 @@ C$OMP END PARALLEL C$OMP PARALLEL REDUCTION (.OR.:L) IF (.TRUE.) L = .NOT. OMP_IN_PARALLEL () C$OMP END PARALLEL + IF (L) CALL ABORT E = OMP_GET_WTIME () IF (D .GT. E) CALL ABORT -- 2.43.5