re PR testsuite/59534 (FAIL: libgomp.fortran/retval1.f90 execution test due to denor...

	PR testsuite/59534
	* testsuite/libgomp.fortran/retval1.f90 (e5): Avoid non-shortcircuited
	comparisons.

From-SVN: r206051

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 566a4c1275205570e7f3ab4fa13e110f1e9a5ac2..308b921900475ee2a72bd4c862519b6414138a60 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR testsuite/59534
+       * testsuite/libgomp.fortran/retval1.f90 (e5): Avoid non-shortcircuited
+       comparisons.
+
 2013-12-16  Jakub Jelinek  <jakub@redhat.com>
 
        PR libgomp/58756

diff --git a/libgomp/testsuite/libgomp.fortran/retval1.f90 b/libgomp/testsuite/libgomp.fortran/retval1.f90
index 8bb07f8fce6f60d97ec7520f539fb59e8971e5bb..b25945731e905966a51e42858e25015687a4829b 100644 (file)
--- a/libgomp/testsuite/libgomp.fortran/retval1.f90
+++ b/libgomp/testsuite/libgomp.fortran/retval1.f90
@@ -91,8 +91,8 @@ entry e5 (is_f5)
   l = .false.
 !$omp parallel firstprivate (f5, e5) shared (is_f5) num_threads (2) &
 !$omp reduction (.or.:l)
-  l = .not. is_f5 .and. e5 .ne. 8
-  l = l .or. (is_f5 .and. f5 .ne. 6.5)
+  if (.not. is_f5) l = l .or. e5 .ne. 8
+  if (is_f5) l = l .or. f5 .ne. 6.5
   if (omp_get_thread_num () .eq. 0) e5 = 8
   if (omp_get_thread_num () .eq. 1) e5 = 14
   f5 = e5 - 4.5