From: Brooks Moses <brooks.moses@codesourcery.com>
Date: Tue, 19 Dec 2006 00:46:46 +0000 (+0000)
Subject: advance.f90: Renamed to advance_1.f90
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=939d0fcd1fb007528ba08c008f36be36ca8ad933;p=gcc.git

advance.f90: Renamed to advance_1.f90

* gfortran.dg/advance.f90: Renamed to advance_1.f90
* gfortran.dg/append-1.f90: Renamed to append_1.f90
* gfortran.dg/array-1.f90: Renamed to array_1.f90
* gfortran.dg/assign_4.f90: Renamed to assign_8.f90
* gfortran.dg/backspace.f: Renamed to backspace_1.f
* gfortran.dg/backspace.f90: Renamed to backspace_7.f90
* gfortran.dg/default_initialization.f: Renamed to default_initialization_1.f
* gfortran.dg/dollar_edit_descriptor-1.f: Renamed to dollar_edit_descriptor_1.f
* gfortran.dg/dollar_edit_descriptor-2.f: Renamed to dollar_edit_descriptor_2.f
* gfortran.dg/dollar_edit_descriptor-3.f: Renamed to dollar_edit_descriptor_3.f
* gfortran.dg/logint-1.f: Renamed to logint_1.f
* gfortran.dg/logint-2.f: Renamed to logint_2.f
* gfortran.dg/logint-3.f: Renamed to logint_3.f
* gfortran.dg/advance_1.f90: Renamed from advance.f90
* gfortran.dg/append_1.f90: Renamed from append-1.f90
* gfortran.dg/array_1.f90: Renamed from array-1.f90
* gfortran.dg/assign_8.f90: Renamed from assign_4.f90
* gfortran.dg/backspace_1.f: Renamed from backspace.f
* gfortran.dg/backspace_7.f90: Renamed from backspace.f90
* gfortran.dg/default_initialization_1.f: Renamed from default_initialization.f
* gfortran.dg/dollar_edit_descriptor_1.f: Renamed from dollar_edit_descriptor-1.f
* gfortran.dg/dollar_edit_descriptor_2.f: Renamed from dollar_edit_descriptor-2.f
* gfortran.dg/dollar_edit_descriptor_3.f: Renamed from dollar_edit_descriptor-3.f
* gfortran.dg/logint_1.f: Renamed from logint-1.f
* gfortran.dg/logint_2.f: Renamed from logint-2.f
* gfortran.dg/logint_3.f: Renamed from logint-3.f

From-SVN: r120035
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ab087db80e5..ae94ba79d88 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,32 @@
+2006-12-18  Brooks Moses  <brooks.moses@codesourcery.com>
+
+	* gfortran.dg/advance.f90: Renamed to advance_1.f90
+	* gfortran.dg/append-1.f90: Renamed to append_1.f90
+	* gfortran.dg/array-1.f90: Renamed to array_1.f90
+	* gfortran.dg/assign_4.f90: Renamed to assign_8.f90
+	* gfortran.dg/backspace.f: Renamed to backspace_1.f
+	* gfortran.dg/backspace.f90: Renamed to backspace_7.f90
+	* gfortran.dg/default_initialization.f: Renamed to default_initialization_1.f
+	* gfortran.dg/dollar_edit_descriptor-1.f: Renamed to dollar_edit_descriptor_1.f
+	* gfortran.dg/dollar_edit_descriptor-2.f: Renamed to dollar_edit_descriptor_2.f
+	* gfortran.dg/dollar_edit_descriptor-3.f: Renamed to dollar_edit_descriptor_3.f
+	* gfortran.dg/logint-1.f: Renamed to logint_1.f
+	* gfortran.dg/logint-2.f: Renamed to logint_2.f
+	* gfortran.dg/logint-3.f: Renamed to logint_3.f
+	* gfortran.dg/advance_1.f90: Renamed from advance.f90
+	* gfortran.dg/append_1.f90: Renamed from append-1.f90
+	* gfortran.dg/array_1.f90: Renamed from array-1.f90
+	* gfortran.dg/assign_8.f90: Renamed from assign_4.f90
+	* gfortran.dg/backspace_1.f: Renamed from backspace.f
+	* gfortran.dg/backspace_7.f90: Renamed from backspace.f90
+	* gfortran.dg/default_initialization_1.f: Renamed from default_initialization.f
+	* gfortran.dg/dollar_edit_descriptor_1.f: Renamed from dollar_edit_descriptor-1.f
+	* gfortran.dg/dollar_edit_descriptor_2.f: Renamed from dollar_edit_descriptor-2.f
+	* gfortran.dg/dollar_edit_descriptor_3.f: Renamed from dollar_edit_descriptor-3.f
+	* gfortran.dg/logint_1.f: Renamed from logint-1.f
+	* gfortran.dg/logint_2.f: Renamed from logint-2.f
+	* gfortran.dg/logint_3.f: Renamed from logint-3.f
+
 2006-12-18  Bill Wendling  <wendling@apple.com>
 
        * g++.old-deja/g++.mike/p11144.C: Renamed id to ID because
diff --git a/gcc/testsuite/gfortran.dg/advance.f90 b/gcc/testsuite/gfortran.dg/advance.f90
deleted file mode 100644
index 9002c52b5f7..00000000000
--- a/gcc/testsuite/gfortran.dg/advance.f90
+++ /dev/null
@@ -1,13 +0,0 @@
-! { dg-do run }
-! PR25463 Check that advance='no' works correctly.
-! Derived from example given in PR by Thomas Koenig
-! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org> 
-program pr25463
-  character(10) :: str
-  write (10,'(A)',advance="no") 'ab'
-  write (10,'(TL2,A)') 'c'
-  rewind (10)
-  read (10, '(a)') str
-  if (str.ne.'abc') call abort()
-  close (10, status='delete')
-end
diff --git a/gcc/testsuite/gfortran.dg/advance_1.f90 b/gcc/testsuite/gfortran.dg/advance_1.f90
new file mode 100644
index 00000000000..9002c52b5f7
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/advance_1.f90
@@ -0,0 +1,13 @@
+! { dg-do run }
+! PR25463 Check that advance='no' works correctly.
+! Derived from example given in PR by Thomas Koenig
+! Contributed by Jerry DeLisle  <jvdelisle@gcc.gnu.org> 
+program pr25463
+  character(10) :: str
+  write (10,'(A)',advance="no") 'ab'
+  write (10,'(TL2,A)') 'c'
+  rewind (10)
+  read (10, '(a)') str
+  if (str.ne.'abc') call abort()
+  close (10, status='delete')
+end
diff --git a/gcc/testsuite/gfortran.dg/append-1.f90 b/gcc/testsuite/gfortran.dg/append-1.f90
deleted file mode 100644
index 8b81bc38484..00000000000
--- a/gcc/testsuite/gfortran.dg/append-1.f90
+++ /dev/null
@@ -1,36 +0,0 @@
-! PR libfortran/21471
-! Testing POSITION="APPEND"
-!
-! { dg-do run }
-      subroutine failed
-        close (10,status='delete')
-        call abort
-      end subroutine failed
-
-      integer,parameter :: n = 13
-      integer :: i, j, error
-
-      open (10, file='foo')
-      close (10)
-
-      do i = 1, n
-        open (10, file='foo',position='append')
-        write (10,*) i
-        close (10)
-      end do
-
-      open (10,file='foo',status='old')
-      error = 0
-      i = -1
-      do while (error == 0)
-        i = i + 1
-        read (10,*,iostat=error) j
-        if (error == 0) then
-          if (i + 1 /= j) call failed
-        end if
-        if (i > n + 1) call failed
-      end do
-      if (i /= n) call failed
-      close (10,status='delete')
-      end
-
diff --git a/gcc/testsuite/gfortran.dg/append_1.f90 b/gcc/testsuite/gfortran.dg/append_1.f90
new file mode 100644
index 00000000000..8b81bc38484
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/append_1.f90
@@ -0,0 +1,36 @@
+! PR libfortran/21471
+! Testing POSITION="APPEND"
+!
+! { dg-do run }
+      subroutine failed
+        close (10,status='delete')
+        call abort
+      end subroutine failed
+
+      integer,parameter :: n = 13
+      integer :: i, j, error
+
+      open (10, file='foo')
+      close (10)
+
+      do i = 1, n
+        open (10, file='foo',position='append')
+        write (10,*) i
+        close (10)
+      end do
+
+      open (10,file='foo',status='old')
+      error = 0
+      i = -1
+      do while (error == 0)
+        i = i + 1
+        read (10,*,iostat=error) j
+        if (error == 0) then
+          if (i + 1 /= j) call failed
+        end if
+        if (i > n + 1) call failed
+      end do
+      if (i /= n) call failed
+      close (10,status='delete')
+      end
+
diff --git a/gcc/testsuite/gfortran.dg/array-1.f90 b/gcc/testsuite/gfortran.dg/array-1.f90
deleted file mode 100644
index 6609025a50e..00000000000
--- a/gcc/testsuite/gfortran.dg/array-1.f90
+++ /dev/null
@@ -1,42 +0,0 @@
-! { dg-do run }
-! PR 15553 : the array used to be filled with garbage
-! this problem disappeared between 2004-05-20 and 2004-09-15
-program arrpack
-  implicit none
-  
-  double precision x(10,10)
-  integer i, j
-
-  x = -1
-  do i=1,6
-     do j=1,5
-        x(i,j) = i+j*10
-     end do
-  end do
-  call pack (x, 6, 5)
-
-  if (any(reshape(x(1:10,1:3), (/ 30 /)) & 
-          /= (/ 11, 12, 13, 14, 15, 16,  &
-                21, 22, 23, 24, 25, 26,  &
-                31, 32, 33, 34, 35, 36,  &
-                41, 42, 43, 44, 45, 46,  &
-                51, 52, 53, 54, 55, 56 /))) call abort ()
-  
-contains
-  
-  subroutine pack (arr, ni, nj)
-    integer, intent(in) :: ni, nj
-    double precision, intent(inout) :: arr(:,:)
-    double precision :: tmp(ni,nj)
-    tmp(:,:) = arr(1:ni, 1:nj)
-    call copy (arr, tmp, ni, nj)
-  end subroutine pack
-  
-  subroutine copy (dst, src, ni, nj)
-    integer, intent(in) :: ni, nj
-    double precision, intent(out) :: dst(ni, nj)
-    double precision, intent(in)  :: src(ni, nj)
-    dst = src
-  end subroutine copy
-  
-end program arrpack
diff --git a/gcc/testsuite/gfortran.dg/array_1.f90 b/gcc/testsuite/gfortran.dg/array_1.f90
new file mode 100644
index 00000000000..6609025a50e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/array_1.f90
@@ -0,0 +1,42 @@
+! { dg-do run }
+! PR 15553 : the array used to be filled with garbage
+! this problem disappeared between 2004-05-20 and 2004-09-15
+program arrpack
+  implicit none
+  
+  double precision x(10,10)
+  integer i, j
+
+  x = -1
+  do i=1,6
+     do j=1,5
+        x(i,j) = i+j*10
+     end do
+  end do
+  call pack (x, 6, 5)
+
+  if (any(reshape(x(1:10,1:3), (/ 30 /)) & 
+          /= (/ 11, 12, 13, 14, 15, 16,  &
+                21, 22, 23, 24, 25, 26,  &
+                31, 32, 33, 34, 35, 36,  &
+                41, 42, 43, 44, 45, 46,  &
+                51, 52, 53, 54, 55, 56 /))) call abort ()
+  
+contains
+  
+  subroutine pack (arr, ni, nj)
+    integer, intent(in) :: ni, nj
+    double precision, intent(inout) :: arr(:,:)
+    double precision :: tmp(ni,nj)
+    tmp(:,:) = arr(1:ni, 1:nj)
+    call copy (arr, tmp, ni, nj)
+  end subroutine pack
+  
+  subroutine copy (dst, src, ni, nj)
+    integer, intent(in) :: ni, nj
+    double precision, intent(out) :: dst(ni, nj)
+    double precision, intent(in)  :: src(ni, nj)
+    dst = src
+  end subroutine copy
+  
+end program arrpack
diff --git a/gcc/testsuite/gfortran.dg/assign_4.f90 b/gcc/testsuite/gfortran.dg/assign_4.f90
deleted file mode 100644
index f958e985904..00000000000
--- a/gcc/testsuite/gfortran.dg/assign_4.f90
+++ /dev/null
@@ -1,4 +0,0 @@
-! { dg-do compile }
-! PR fortran/20883
-      write (*, a) b ! { dg-error "must be of type CHARACTER or INTEGER" }
-      end
diff --git a/gcc/testsuite/gfortran.dg/assign_8.f90 b/gcc/testsuite/gfortran.dg/assign_8.f90
new file mode 100644
index 00000000000..f958e985904
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/assign_8.f90
@@ -0,0 +1,4 @@
+! { dg-do compile }
+! PR fortran/20883
+      write (*, a) b ! { dg-error "must be of type CHARACTER or INTEGER" }
+      end
diff --git a/gcc/testsuite/gfortran.dg/backspace.f b/gcc/testsuite/gfortran.dg/backspace.f
deleted file mode 100644
index c3ec0c41756..00000000000
--- a/gcc/testsuite/gfortran.dg/backspace.f
+++ /dev/null
@@ -1,82 +0,0 @@
-! This file is all about BACKSPACE
-! { dg-do run }
-
-      integer i, n, nr
-      real x(10), y(10)
-
-! PR libfortran/20068
-      open (20, status='scratch')
-      write (20,*) 1
-      write (20,*) 2
-      write (20,*) 3
-      rewind (20)
-      read (20,*) i
-      if (i .ne. 1) call abort
-      write (*,*) ' '
-      backspace (20)
-      read (20,*) i
-      if (i .ne. 1) call abort
-      close (20)
-
-! PR libfortran/20125
-      open (20, status='scratch')
-      write (20,*) 7
-      backspace (20)
-      read (20,*) i
-      if (i .ne. 7) call abort
-      close (20)
-
-      open (20, status='scratch', form='unformatted')
-      write (20) 8
-      backspace (20)
-      read (20) i
-      if (i .ne. 8) call abort
-      close (20)
-
-! PR libfortran/20471
-      do n = 1, 10
-        x(n) = sqrt(real(n))
-      end do
-      open (3, form='unformatted', status='scratch')
-      write (3) (x(n),n=1,10)
-      backspace (3)
-      rewind (3)
-      read (3) (y(n),n=1,10)
-
-      do n = 1, 10
-        if (abs(x(n)-y(n)) > 0.00001) call abort
-      end do
-      close (3)
-
-! PR libfortran/20156
-      open (3, form='unformatted', status='scratch')
-      do i = 1, 5
-        x(1) = i
-        write (3) n, (x(n),n=1,10)
-      end do
-      nr = 0
-      rewind (3)
-  20  continue
-      read (3,end=30,err=90) n, (x(n),n=1,10)
-      nr = nr + 1
-      goto 20
-  30  continue
-      if (nr .ne. 5) call abort
-
-      do i = 1, nr+1
-        backspace (3)
-      end do
-
-      do i = 1, nr
-        read(3,end=70,err=90) n, (x(n),n=1,10)
-        if (abs(x(1) - i) .gt. 0.001) call abort
-      end do
-      close (3)
-      stop
-
-  70  continue
-      call abort
-  90  continue
-      call abort
-
-      end
diff --git a/gcc/testsuite/gfortran.dg/backspace.f90 b/gcc/testsuite/gfortran.dg/backspace.f90
deleted file mode 100644
index 4f0b9e975d6..00000000000
--- a/gcc/testsuite/gfortran.dg/backspace.f90
+++ /dev/null
@@ -1,11 +0,0 @@
-! { dg-do run }
-!pr18284 BACKSPACE broken
-       open(unit=10,access='SEQUENTIAL',status='SCRATCH')
-       do I = 1,200
-         write(10,*)I
-       end do
-       backspace(10)
-       backspace(10)
-       read(10,*)I
-       if (I.NE.199) call abort
-       end
diff --git a/gcc/testsuite/gfortran.dg/backspace_1.f b/gcc/testsuite/gfortran.dg/backspace_1.f
new file mode 100644
index 00000000000..c3ec0c41756
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/backspace_1.f
@@ -0,0 +1,82 @@
+! This file is all about BACKSPACE
+! { dg-do run }
+
+      integer i, n, nr
+      real x(10), y(10)
+
+! PR libfortran/20068
+      open (20, status='scratch')
+      write (20,*) 1
+      write (20,*) 2
+      write (20,*) 3
+      rewind (20)
+      read (20,*) i
+      if (i .ne. 1) call abort
+      write (*,*) ' '
+      backspace (20)
+      read (20,*) i
+      if (i .ne. 1) call abort
+      close (20)
+
+! PR libfortran/20125
+      open (20, status='scratch')
+      write (20,*) 7
+      backspace (20)
+      read (20,*) i
+      if (i .ne. 7) call abort
+      close (20)
+
+      open (20, status='scratch', form='unformatted')
+      write (20) 8
+      backspace (20)
+      read (20) i
+      if (i .ne. 8) call abort
+      close (20)
+
+! PR libfortran/20471
+      do n = 1, 10
+        x(n) = sqrt(real(n))
+      end do
+      open (3, form='unformatted', status='scratch')
+      write (3) (x(n),n=1,10)
+      backspace (3)
+      rewind (3)
+      read (3) (y(n),n=1,10)
+
+      do n = 1, 10
+        if (abs(x(n)-y(n)) > 0.00001) call abort
+      end do
+      close (3)
+
+! PR libfortran/20156
+      open (3, form='unformatted', status='scratch')
+      do i = 1, 5
+        x(1) = i
+        write (3) n, (x(n),n=1,10)
+      end do
+      nr = 0
+      rewind (3)
+  20  continue
+      read (3,end=30,err=90) n, (x(n),n=1,10)
+      nr = nr + 1
+      goto 20
+  30  continue
+      if (nr .ne. 5) call abort
+
+      do i = 1, nr+1
+        backspace (3)
+      end do
+
+      do i = 1, nr
+        read(3,end=70,err=90) n, (x(n),n=1,10)
+        if (abs(x(1) - i) .gt. 0.001) call abort
+      end do
+      close (3)
+      stop
+
+  70  continue
+      call abort
+  90  continue
+      call abort
+
+      end
diff --git a/gcc/testsuite/gfortran.dg/backspace_7.f90 b/gcc/testsuite/gfortran.dg/backspace_7.f90
new file mode 100644
index 00000000000..4f0b9e975d6
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/backspace_7.f90
@@ -0,0 +1,11 @@
+! { dg-do run }
+!pr18284 BACKSPACE broken
+       open(unit=10,access='SEQUENTIAL',status='SCRATCH')
+       do I = 1,200
+         write(10,*)I
+       end do
+       backspace(10)
+       backspace(10)
+       read(10,*)I
+       if (I.NE.199) call abort
+       end
diff --git a/gcc/testsuite/gfortran.dg/default_initialization.f90 b/gcc/testsuite/gfortran.dg/default_initialization.f90
deleted file mode 100644
index fe67e2f5f88..00000000000
--- a/gcc/testsuite/gfortran.dg/default_initialization.f90
+++ /dev/null
@@ -1,20 +0,0 @@
-!
-! { dg-do compile }
-! PR 20845
-!
-! In ISO/IEC 1539-1:1997(E), 4th constraint in section 11.3:
-!
-!   If an object of a type for which component-initialization is specified
-!   (R429) appears in the specification-part of a module and does not have
-!   the ALLOCATABLE or POINTER attribute, the object shall have the SAVE
-!   attribute.
-!
-module bad
-   implicit none
-   type default_initialization
-      integer :: x = 42
-   end type default_initialization
-   type (default_initialization) t ! { dg-error "default initialization" }
-end module bad
-
-! { dg-final { cleanup-modules "bad" } }
diff --git a/gcc/testsuite/gfortran.dg/default_initialization_1.f90 b/gcc/testsuite/gfortran.dg/default_initialization_1.f90
new file mode 100644
index 00000000000..fe67e2f5f88
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/default_initialization_1.f90
@@ -0,0 +1,20 @@
+!
+! { dg-do compile }
+! PR 20845
+!
+! In ISO/IEC 1539-1:1997(E), 4th constraint in section 11.3:
+!
+!   If an object of a type for which component-initialization is specified
+!   (R429) appears in the specification-part of a module and does not have
+!   the ALLOCATABLE or POINTER attribute, the object shall have the SAVE
+!   attribute.
+!
+module bad
+   implicit none
+   type default_initialization
+      integer :: x = 42
+   end type default_initialization
+   type (default_initialization) t ! { dg-error "default initialization" }
+end module bad
+
+! { dg-final { cleanup-modules "bad" } }
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-1.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-1.f
deleted file mode 100644
index af22c453636..00000000000
--- a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-1.f
+++ /dev/null
@@ -1,13 +0,0 @@
-! { dg-do run }
-! { dg-options "-w" }
-! PR libfortran/20006
-      character*5 c
-      open (42,status='scratch')
-      write (42,'(A,$)') 'abc'
-      write (42,'(A)') 'de'
-      rewind (42)
-      read (42,'(A)') c
-      close (42)
-
-      if (c /= 'abcde') call abort
-      end
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-2.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-2.f
deleted file mode 100644
index 4973d87ac0e..00000000000
--- a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-2.f
+++ /dev/null
@@ -1,9 +0,0 @@
-! { dg-do run }
-! { dg-options "-w" }
-! PR25545 internal file and dollar edit descriptor.
-      program main
-      character*20 line
-      line = '1234567890ABCDEFGHIJ'
-      write (line, '(A$)') 'asdf'
-      if (line.ne.'asdf') call abort()
-      end
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-3.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-3.f
deleted file mode 100644
index 6e5bf6890f2..00000000000
--- a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor-3.f
+++ /dev/null
@@ -1,8 +0,0 @@
-! { dg-do run }
-! { dg-options "-std=gnu" }
-! Test for dollar descriptor in the middle of a format
-300   format(1000(a,$)) ! { dg-warning "should be the last specifier" }
-      write(*,300) "gee", "gee"
-      write(*,"(1000(a,$))") "foo", "bar" ! { dg-warning "should be the last specifier" }
-      end
-! { dg-output "^geegeefoobar$" }
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_1.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_1.f
new file mode 100644
index 00000000000..af22c453636
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_1.f
@@ -0,0 +1,13 @@
+! { dg-do run }
+! { dg-options "-w" }
+! PR libfortran/20006
+      character*5 c
+      open (42,status='scratch')
+      write (42,'(A,$)') 'abc'
+      write (42,'(A)') 'de'
+      rewind (42)
+      read (42,'(A)') c
+      close (42)
+
+      if (c /= 'abcde') call abort
+      end
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_2.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_2.f
new file mode 100644
index 00000000000..4973d87ac0e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_2.f
@@ -0,0 +1,9 @@
+! { dg-do run }
+! { dg-options "-w" }
+! PR25545 internal file and dollar edit descriptor.
+      program main
+      character*20 line
+      line = '1234567890ABCDEFGHIJ'
+      write (line, '(A$)') 'asdf'
+      if (line.ne.'asdf') call abort()
+      end
diff --git a/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_3.f b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_3.f
new file mode 100644
index 00000000000..6e5bf6890f2
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/dollar_edit_descriptor_3.f
@@ -0,0 +1,8 @@
+! { dg-do run }
+! { dg-options "-std=gnu" }
+! Test for dollar descriptor in the middle of a format
+300   format(1000(a,$)) ! { dg-warning "should be the last specifier" }
+      write(*,300) "gee", "gee"
+      write(*,"(1000(a,$))") "foo", "bar" ! { dg-warning "should be the last specifier" }
+      end
+! { dg-output "^geegeefoobar$" }
diff --git a/gcc/testsuite/gfortran.dg/logint-1.f b/gcc/testsuite/gfortran.dg/logint-1.f
deleted file mode 100644
index a316978588d..00000000000
--- a/gcc/testsuite/gfortran.dg/logint-1.f
+++ /dev/null
@@ -1,43 +0,0 @@
-c { dg-do compile }
-c { dg-options "-O2 -std=legacy" }
-       LOGICAL(kind=1) l1
-       LOGICAL(kind=2) l2
-       LOGICAL         l4
-       INTEGER(kind=1) i1
-       INTEGER(kind=2) i2
-       INTEGER         i4
-
-       i1 = .TRUE.
-       i2 = .TRUE.
-       i4 = .TRUE.
-
-       i1 = .FALSE.
-       i2 = .FALSE.
-       i4 = .FALSE.
-
-       i1 = l1
-       i2 = l1
-       i4 = l1
-
-       i1 = l2
-       i2 = l2
-       i4 = l2
-
-       i1 = l4
-       i2 = l4
-       i4 = l4
-
-       l1 = i1
-       l2 = i1
-       l4 = i1
-
-       l1 = i2
-       l2 = i2
-       l4 = i2
-
-       l1 = i4
-       l2 = i4
-       l4 = i4
-
-       END
- 
diff --git a/gcc/testsuite/gfortran.dg/logint-2.f b/gcc/testsuite/gfortran.dg/logint-2.f
deleted file mode 100644
index 19d387315c8..00000000000
--- a/gcc/testsuite/gfortran.dg/logint-2.f
+++ /dev/null
@@ -1,43 +0,0 @@
-c { dg-do compile }
-c { dg-options "-O2 -std=f95" }
-       LOGICAL(kind=1) l1
-       LOGICAL(kind=2) l2
-       LOGICAL         l4
-       INTEGER(kind=1) i1
-       INTEGER(kind=2) i2
-       INTEGER         i4
-
-       i1 = .TRUE.  ! { dg-error "convert" }
-       i2 = .TRUE.  ! { dg-error "convert" }
-       i4 = .TRUE.  ! { dg-error "convert" }
-
-       i1 = .FALSE. ! { dg-error "convert" }
-       i2 = .FALSE. ! { dg-error "convert" }
-       i4 = .FALSE. ! { dg-error "convert" }
-
-       i1 = l1      ! { dg-error "convert" }
-       i2 = l1      ! { dg-error "convert" }
-       i4 = l1      ! { dg-error "convert" }
-
-       i1 = l2      ! { dg-error "convert" }
-       i2 = l2      ! { dg-error "convert" }
-       i4 = l2      ! { dg-error "convert" }
-
-       i1 = l4      ! { dg-error "convert" }
-       i2 = l4      ! { dg-error "convert" }
-       i4 = l4      ! { dg-error "convert" }
-
-       l1 = i1      ! { dg-error "convert" }
-       l2 = i1      ! { dg-error "convert" }
-       l4 = i1      ! { dg-error "convert" }
-
-       l1 = i2      ! { dg-error "convert" }
-       l2 = i2      ! { dg-error "convert" }
-       l4 = i2      ! { dg-error "convert" }
-
-       l1 = i4      ! { dg-error "convert" }
-       l2 = i4      ! { dg-error "convert" }
-       l4 = i4      ! { dg-error "convert" }
-
-       END
- 
diff --git a/gcc/testsuite/gfortran.dg/logint-3.f b/gcc/testsuite/gfortran.dg/logint-3.f
deleted file mode 100644
index 7f6780c8475..00000000000
--- a/gcc/testsuite/gfortran.dg/logint-3.f
+++ /dev/null
@@ -1,43 +0,0 @@
-c { dg-do compile }
-c { dg-options "-O2" }
-       LOGICAL(kind=1) l1
-       LOGICAL(kind=2) l2
-       LOGICAL         l4
-       INTEGER(kind=1) i1
-       INTEGER(kind=2) i2
-       INTEGER         i4
-
-       i1 = .TRUE.  ! { dg-warning "Extension: Conversion" }
-       i2 = .TRUE.  ! { dg-warning "Extension: Conversion" }
-       i4 = .TRUE.  ! { dg-warning "Extension: Conversion" }
-
-       i1 = .FALSE. ! { dg-warning "Extension: Conversion" }
-       i2 = .FALSE. ! { dg-warning "Extension: Conversion" }
-       i4 = .FALSE. ! { dg-warning "Extension: Conversion" }
-
-       i1 = l1      ! { dg-warning "Extension: Conversion" }
-       i2 = l1      ! { dg-warning "Extension: Conversion" }
-       i4 = l1      ! { dg-warning "Extension: Conversion" }
-
-       i1 = l2      ! { dg-warning "Extension: Conversion" }
-       i2 = l2      ! { dg-warning "Extension: Conversion" }
-       i4 = l2      ! { dg-warning "Extension: Conversion" }
-
-       i1 = l4      ! { dg-warning "Extension: Conversion" }
-       i2 = l4      ! { dg-warning "Extension: Conversion" }
-       i4 = l4      ! { dg-warning "Extension: Conversion" }
-
-       l1 = i1      ! { dg-warning "Extension: Conversion" }
-       l2 = i1      ! { dg-warning "Extension: Conversion" }
-       l4 = i1      ! { dg-warning "Extension: Conversion" }
-
-       l1 = i2      ! { dg-warning "Extension: Conversion" }
-       l2 = i2      ! { dg-warning "Extension: Conversion" }
-       l4 = i2      ! { dg-warning "Extension: Conversion" }
-
-       l1 = i4      ! { dg-warning "Extension: Conversion" }
-       l2 = i4      ! { dg-warning "Extension: Conversion" }
-       l4 = i4      ! { dg-warning "Extension: Conversion" }
-
-       END
- 
diff --git a/gcc/testsuite/gfortran.dg/logint_1.f b/gcc/testsuite/gfortran.dg/logint_1.f
new file mode 100644
index 00000000000..a316978588d
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logint_1.f
@@ -0,0 +1,43 @@
+c { dg-do compile }
+c { dg-options "-O2 -std=legacy" }
+       LOGICAL(kind=1) l1
+       LOGICAL(kind=2) l2
+       LOGICAL         l4
+       INTEGER(kind=1) i1
+       INTEGER(kind=2) i2
+       INTEGER         i4
+
+       i1 = .TRUE.
+       i2 = .TRUE.
+       i4 = .TRUE.
+
+       i1 = .FALSE.
+       i2 = .FALSE.
+       i4 = .FALSE.
+
+       i1 = l1
+       i2 = l1
+       i4 = l1
+
+       i1 = l2
+       i2 = l2
+       i4 = l2
+
+       i1 = l4
+       i2 = l4
+       i4 = l4
+
+       l1 = i1
+       l2 = i1
+       l4 = i1
+
+       l1 = i2
+       l2 = i2
+       l4 = i2
+
+       l1 = i4
+       l2 = i4
+       l4 = i4
+
+       END
+ 
diff --git a/gcc/testsuite/gfortran.dg/logint_2.f b/gcc/testsuite/gfortran.dg/logint_2.f
new file mode 100644
index 00000000000..19d387315c8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logint_2.f
@@ -0,0 +1,43 @@
+c { dg-do compile }
+c { dg-options "-O2 -std=f95" }
+       LOGICAL(kind=1) l1
+       LOGICAL(kind=2) l2
+       LOGICAL         l4
+       INTEGER(kind=1) i1
+       INTEGER(kind=2) i2
+       INTEGER         i4
+
+       i1 = .TRUE.  ! { dg-error "convert" }
+       i2 = .TRUE.  ! { dg-error "convert" }
+       i4 = .TRUE.  ! { dg-error "convert" }
+
+       i1 = .FALSE. ! { dg-error "convert" }
+       i2 = .FALSE. ! { dg-error "convert" }
+       i4 = .FALSE. ! { dg-error "convert" }
+
+       i1 = l1      ! { dg-error "convert" }
+       i2 = l1      ! { dg-error "convert" }
+       i4 = l1      ! { dg-error "convert" }
+
+       i1 = l2      ! { dg-error "convert" }
+       i2 = l2      ! { dg-error "convert" }
+       i4 = l2      ! { dg-error "convert" }
+
+       i1 = l4      ! { dg-error "convert" }
+       i2 = l4      ! { dg-error "convert" }
+       i4 = l4      ! { dg-error "convert" }
+
+       l1 = i1      ! { dg-error "convert" }
+       l2 = i1      ! { dg-error "convert" }
+       l4 = i1      ! { dg-error "convert" }
+
+       l1 = i2      ! { dg-error "convert" }
+       l2 = i2      ! { dg-error "convert" }
+       l4 = i2      ! { dg-error "convert" }
+
+       l1 = i4      ! { dg-error "convert" }
+       l2 = i4      ! { dg-error "convert" }
+       l4 = i4      ! { dg-error "convert" }
+
+       END
+ 
diff --git a/gcc/testsuite/gfortran.dg/logint_3.f b/gcc/testsuite/gfortran.dg/logint_3.f
new file mode 100644
index 00000000000..7f6780c8475
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/logint_3.f
@@ -0,0 +1,43 @@
+c { dg-do compile }
+c { dg-options "-O2" }
+       LOGICAL(kind=1) l1
+       LOGICAL(kind=2) l2
+       LOGICAL         l4
+       INTEGER(kind=1) i1
+       INTEGER(kind=2) i2
+       INTEGER         i4
+
+       i1 = .TRUE.  ! { dg-warning "Extension: Conversion" }
+       i2 = .TRUE.  ! { dg-warning "Extension: Conversion" }
+       i4 = .TRUE.  ! { dg-warning "Extension: Conversion" }
+
+       i1 = .FALSE. ! { dg-warning "Extension: Conversion" }
+       i2 = .FALSE. ! { dg-warning "Extension: Conversion" }
+       i4 = .FALSE. ! { dg-warning "Extension: Conversion" }
+
+       i1 = l1      ! { dg-warning "Extension: Conversion" }
+       i2 = l1      ! { dg-warning "Extension: Conversion" }
+       i4 = l1      ! { dg-warning "Extension: Conversion" }
+
+       i1 = l2      ! { dg-warning "Extension: Conversion" }
+       i2 = l2      ! { dg-warning "Extension: Conversion" }
+       i4 = l2      ! { dg-warning "Extension: Conversion" }
+
+       i1 = l4      ! { dg-warning "Extension: Conversion" }
+       i2 = l4      ! { dg-warning "Extension: Conversion" }
+       i4 = l4      ! { dg-warning "Extension: Conversion" }
+
+       l1 = i1      ! { dg-warning "Extension: Conversion" }
+       l2 = i1      ! { dg-warning "Extension: Conversion" }
+       l4 = i1      ! { dg-warning "Extension: Conversion" }
+
+       l1 = i2      ! { dg-warning "Extension: Conversion" }
+       l2 = i2      ! { dg-warning "Extension: Conversion" }
+       l4 = i2      ! { dg-warning "Extension: Conversion" }
+
+       l1 = i4      ! { dg-warning "Extension: Conversion" }
+       l2 = i4      ! { dg-warning "Extension: Conversion" }
+       l4 = i4      ! { dg-warning "Extension: Conversion" }
+
+       END
+