* gfortran.dg/ieee/ieee_1.F90: Revert rename.

From-SVN: r212573

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a9da99eb695f0228a10e082d4a52e5a20f41747..8a4c7f38cccd310b0bf5c93eac628d5f4bce5cf5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-15  Uros Bizjak  <ubizjak@gmail.com>
+
+       * gfortran.dg/ieee/rounding_1.f90: Rename from ieee_rounding_1.f90.
+       * gfortran.dg/ieee/ieee_1.F90 (dg-additional-options): Add
+       -mieee-with-inexact for alpha*-*-*.
+
 2014-07-15  Uros Bizjak  <ubizjak@gmail.com>
 
        * lib/target-supports.exp (check_effective_target_fenv_exceptions):

diff --git a/gcc/testsuite/gfortran.dg/ieee/ieee_1.F90 b/gcc/testsuite/gfortran.dg/ieee/ieee_1.F90
new file mode 100644 (file)
index 0000000..8e2e0ca
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/ieee/ieee_1.F90
@@ -0,0 +1,150 @@
+! { dg-do run }
+! { dg-additional-options "-ffree-line-length-none" }
+! { dg-additional-options "-mieee-with-inexact" { target alpha*-*-* } }
+!
+! Use dg-additional-options rather than dg-options to avoid overwriting the
+! default IEEE options which are passed by ieee.exp and necessary.
+
+  use ieee_features, only : ieee_datatype, ieee_denormal, ieee_divide, &
+      ieee_halting, ieee_inexact_flag, ieee_inf, ieee_invalid_flag, &
+      ieee_nan, ieee_rounding, ieee_sqrt, ieee_underflow_flag
+  use ieee_exceptions
+
+  implicit none
+
+  type(ieee_flag_type), parameter :: x(5) = &
+    [ IEEE_INVALID, IEEE_OVERFLOW, IEEE_DIVIDE_BY_ZERO, &
+      IEEE_UNDERFLOW, IEEE_INEXACT ]
+  logical :: l(5) = .false.
+  character(len=5) :: s
+
+#define FLAGS_STRING(S) \
+  call ieee_get_flag(x, l) ; \
+  write(S,"(5(A1))") merge(["I","O","Z","U","P"],[" "," "," "," "," "],l)
+
+#define CHECK_FLAGS(expected) \
+  FLAGS_STRING(s) ; \
+  if (s /= expected) then ; \
+    write (*,"(A,I0,A,A)") "Flags at line ", __LINE__, ": ", s ; \
+    call abort ; \
+  end if ; \
+  call check_flag_sub
+
+  real, volatile :: sx
+  double precision, volatile :: dx
+
+  ! This file tests IEEE_SET_FLAG and IEEE_GET_FLAG
+
+  !!!! IEEE float
+
+  ! Initial flags are all off
+  CHECK_FLAGS("     ")
+
+  ! Check we can clear them
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise invalid, then clear
+  sx = -1
+  sx = sqrt(sx)
+  CHECK_FLAGS("I    ")
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise overflow and precision
+  sx = huge(sx)
+  CHECK_FLAGS("     ")
+  sx = sx*sx
+  CHECK_FLAGS(" O  P")
+
+  ! Also raise divide-by-zero
+  sx = 0
+  sx = 1 / sx
+  CHECK_FLAGS(" OZ P")
+
+  ! Clear them
+  call ieee_set_flag([ieee_overflow,ieee_inexact,&
+                      ieee_divide_by_zero],[.false.,.false.,.true.])
+  CHECK_FLAGS("  Z  ")
+  call ieee_set_flag(ieee_divide_by_zero, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise underflow
+  sx = tiny(sx)
+  CHECK_FLAGS("     ")
+  sx = sx / 10
+  CHECK_FLAGS("   UP")
+
+  ! Raise everything
+  call ieee_set_flag(ieee_all, .true.)
+  CHECK_FLAGS("IOZUP")
+
+  ! And clear
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+  !!!! IEEE double
+
+  ! Initial flags are all off
+  CHECK_FLAGS("     ")
+
+  ! Check we can clear them
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise invalid, then clear
+  dx = -1
+  dx = sqrt(dx)
+  CHECK_FLAGS("I    ")
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise overflow and precision
+  dx = huge(dx)
+  CHECK_FLAGS("     ")
+  dx = dx*dx
+  CHECK_FLAGS(" O  P")
+
+  ! Also raise divide-by-zero
+  dx = 0
+  dx = 1 / dx
+  CHECK_FLAGS(" OZ P")
+
+  ! Clear them
+  call ieee_set_flag([ieee_overflow,ieee_inexact,&
+                      ieee_divide_by_zero],[.false.,.false.,.true.])
+  CHECK_FLAGS("  Z  ")
+  call ieee_set_flag(ieee_divide_by_zero, .false.)
+  CHECK_FLAGS("     ")
+
+  ! Raise underflow
+  dx = tiny(dx)
+  CHECK_FLAGS("     ")
+  dx = dx / 10
+  CHECK_FLAGS("   UP")
+
+  ! Raise everything
+  call ieee_set_flag(ieee_all, .true.)
+  CHECK_FLAGS("IOZUP")
+
+  ! And clear
+  call ieee_set_flag(ieee_all, .false.)
+  CHECK_FLAGS("     ")
+
+contains
+
+  subroutine check_flag_sub
+    use ieee_exceptions
+    logical :: l(5) = .false.
+    type(ieee_flag_type), parameter :: x(5) = &
+      [ IEEE_INVALID, IEEE_OVERFLOW, IEEE_DIVIDE_BY_ZERO, &
+        IEEE_UNDERFLOW, IEEE_INEXACT ]
+    call ieee_get_flag(x, l)
+
+    if (any(l)) then
+      print *, "Flags not cleared in subroutine"
+      call abort
+    end if
+  end subroutine
+
+end

diff --git a/gcc/testsuite/gfortran.dg/ieee/ieee_1.f90 b/gcc/testsuite/gfortran.dg/ieee/ieee_1.f90
deleted file mode 100644 (file)
index 8e2e0ca..0000000
--- a/gcc/testsuite/gfortran.dg/ieee/ieee_1.f90
+++ /dev/null
@@ -1,150 +0,0 @@
-! { dg-do run }
-! { dg-additional-options "-ffree-line-length-none" }
-! { dg-additional-options "-mieee-with-inexact" { target alpha*-*-* } }
-!
-! Use dg-additional-options rather than dg-options to avoid overwriting the
-! default IEEE options which are passed by ieee.exp and necessary.
-
-  use ieee_features, only : ieee_datatype, ieee_denormal, ieee_divide, &
-      ieee_halting, ieee_inexact_flag, ieee_inf, ieee_invalid_flag, &
-      ieee_nan, ieee_rounding, ieee_sqrt, ieee_underflow_flag
-  use ieee_exceptions
-
-  implicit none
-
-  type(ieee_flag_type), parameter :: x(5) = &
-    [ IEEE_INVALID, IEEE_OVERFLOW, IEEE_DIVIDE_BY_ZERO, &
-      IEEE_UNDERFLOW, IEEE_INEXACT ]
-  logical :: l(5) = .false.
-  character(len=5) :: s
-
-#define FLAGS_STRING(S) \
-  call ieee_get_flag(x, l) ; \
-  write(S,"(5(A1))") merge(["I","O","Z","U","P"],[" "," "," "," "," "],l)
-
-#define CHECK_FLAGS(expected) \
-  FLAGS_STRING(s) ; \
-  if (s /= expected) then ; \
-    write (*,"(A,I0,A,A)") "Flags at line ", __LINE__, ": ", s ; \
-    call abort ; \
-  end if ; \
-  call check_flag_sub
-
-  real, volatile :: sx
-  double precision, volatile :: dx
-
-  ! This file tests IEEE_SET_FLAG and IEEE_GET_FLAG
-
-  !!!! IEEE float
-
-  ! Initial flags are all off
-  CHECK_FLAGS("     ")
-
-  ! Check we can clear them
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise invalid, then clear
-  sx = -1
-  sx = sqrt(sx)
-  CHECK_FLAGS("I    ")
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise overflow and precision
-  sx = huge(sx)
-  CHECK_FLAGS("     ")
-  sx = sx*sx
-  CHECK_FLAGS(" O  P")
-
-  ! Also raise divide-by-zero
-  sx = 0
-  sx = 1 / sx
-  CHECK_FLAGS(" OZ P")
-
-  ! Clear them
-  call ieee_set_flag([ieee_overflow,ieee_inexact,&
-                      ieee_divide_by_zero],[.false.,.false.,.true.])
-  CHECK_FLAGS("  Z  ")
-  call ieee_set_flag(ieee_divide_by_zero, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise underflow
-  sx = tiny(sx)
-  CHECK_FLAGS("     ")
-  sx = sx / 10
-  CHECK_FLAGS("   UP")
-
-  ! Raise everything
-  call ieee_set_flag(ieee_all, .true.)
-  CHECK_FLAGS("IOZUP")
-
-  ! And clear
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-  !!!! IEEE double
-
-  ! Initial flags are all off
-  CHECK_FLAGS("     ")
-
-  ! Check we can clear them
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise invalid, then clear
-  dx = -1
-  dx = sqrt(dx)
-  CHECK_FLAGS("I    ")
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise overflow and precision
-  dx = huge(dx)
-  CHECK_FLAGS("     ")
-  dx = dx*dx
-  CHECK_FLAGS(" O  P")
-
-  ! Also raise divide-by-zero
-  dx = 0
-  dx = 1 / dx
-  CHECK_FLAGS(" OZ P")
-
-  ! Clear them
-  call ieee_set_flag([ieee_overflow,ieee_inexact,&
-                      ieee_divide_by_zero],[.false.,.false.,.true.])
-  CHECK_FLAGS("  Z  ")
-  call ieee_set_flag(ieee_divide_by_zero, .false.)
-  CHECK_FLAGS("     ")
-
-  ! Raise underflow
-  dx = tiny(dx)
-  CHECK_FLAGS("     ")
-  dx = dx / 10
-  CHECK_FLAGS("   UP")
-
-  ! Raise everything
-  call ieee_set_flag(ieee_all, .true.)
-  CHECK_FLAGS("IOZUP")
-
-  ! And clear
-  call ieee_set_flag(ieee_all, .false.)
-  CHECK_FLAGS("     ")
-
-contains
-
-  subroutine check_flag_sub
-    use ieee_exceptions
-    logical :: l(5) = .false.
-    type(ieee_flag_type), parameter :: x(5) = &
-      [ IEEE_INVALID, IEEE_OVERFLOW, IEEE_DIVIDE_BY_ZERO, &
-        IEEE_UNDERFLOW, IEEE_INEXACT ]
-    call ieee_get_flag(x, l)
-
-    if (any(l)) then
-      print *, "Flags not cleared in subroutine"
-      call abort
-    end if
-  end subroutine
-
-end