This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

RE: g77 tests for formatted I/O


Test g77.dg/f77-edit-i-out.f is incomplete.  
 - need to replace \* with \\* for some systems
 - didn't allow for \r\n or \r line endings

I have committed the following, which addresses these problems, as an obvious fix.  It may be better to remove the test and try an alternative approach.   

2002-01-30  David Billinghurst  <David.Billinghurst@riotinto.com>

	* g77.dg/f77-edit-i-out.f:  Escape \. Allow \r\n and \r.

+++ f77-edit-i-out.f    2002/01/30 04:21:13
@@ -6,22 +6,21 @@
 C { dg-do run }
 C { dg-output "^" }
 
-      write(*,'(I1)')    1  ! { dg-output "1\n" }
-      write(*,'(I1)')   -1  ! { dg-output "\*\n" }
-      write(*,'(I2)')    2  ! { dg-output " 2\n" }
-      write(*,'(I2)')   -2  ! { dg-output "-2\n" }
-      write(*,'(I3)')    3  ! { dg-output "  3\n" }
-      write(*,'(I3)')   -3  ! { dg-output " -3\n" }
+      write(*,'(I1)')    1  ! { dg-output "1(\n|\r\n|\r)" }
+      write(*,'(I1)')   -1  ! { dg-output "\\*(\n|\r\n|\r)" }
+      write(*,'(I2)')    2  ! { dg-output " 2(\n|\r\n|\r)" }
+      write(*,'(I2)')   -2  ! { dg-output "-2(\n|\r\n|\r)" }
+      write(*,'(I3)')    3  ! { dg-output "  3(\n|\r\n|\r)" }
+      write(*,'(I3)')   -3  ! { dg-output " -3(\n|\r\n|\r)" }
 
-      write(*,'(I2.0)')  0  ! { dg-output "  \n" }
-      write(*,'(I1.1)')  4  ! { dg-output "4\n" }
-      write(*,'(I1.1)') -4  ! { dg-output "\*\n" }
-      write(*,'(I2.1)')  5  ! { dg-output " 5\n" }
-      write(*,'(I2.1)') -5  ! { dg-output "-5\n" }
-      write(*,'(I2.2)')  6  ! { dg-output "06\n" }
-      write(*,'(I2.2)') -6  ! { dg-output "\*\*\n" }
-      write(*,'(I3.2)')  7  ! { dg-output " 07\n" }
-      write(*,'(I3.2)') -7  ! { dg-output "-07\n" }
+      write(*,'(I2.0)')  0  ! { dg-output "  (\n|\r\n|\r)" }
+      write(*,'(I1.1)')  4  ! { dg-output "4(\n|\r\n|\r)" }
+      write(*,'(I1.1)') -4  ! { dg-output "\\*(\n|\r\n|\r)" }
+      write(*,'(I2.1)')  5  ! { dg-output " 5(\n|\r\n|\r)" }
+      write(*,'(I2.1)') -5  ! { dg-output "-5(\n|\r\n|\r)" }
+      write(*,'(I2.2)')  6  ! { dg-output "06(\n|\r\n|\r)" }
+      write(*,'(I2.2)') -6  ! { dg-output "\\*\\*(\n|\r\n|\r)" }
+      write(*,'(I3.2)')  7  ! { dg-output " 07(\n|\r\n|\r)" }
+      write(*,'(I3.2)') -7  ! { dg-output "-07(\n|\r\n|\r)" }
 
-C { dg-output "$" }
       end


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]