re PR testsuite/40426 (Revision 148408 caused many DWARF tests faulures)

	PR testsuite/40426
	* lib/gcc-dg.exp (gcc-dg-debug-runtest): For type -gdwarf-2 and
	level != "" use separate -gdwarf-2 -g${level} options instead of
	-gdwarf-2${level}.
	* lib/gfortran-dg.exp (gfortran-dg-debug-runtest): Likewise.
	* gfortran.dg/debug/pr37738.f: Also skip if -gdwarf-2 -g1.
	* gfortran.dg/debug/pr35154-dwarf2.f: Likewise.

From-SVN: r148497

5 files changed, 39 insertions, 10 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0fcde10..a409a2e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2009-06-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR testsuite/40426
+	* lib/gcc-dg.exp (gcc-dg-debug-runtest): For type -gdwarf-2 and
+	level != "" use separate -gdwarf-2 -g${level} options instead of
+	-gdwarf-2${level}.
+	* lib/gfortran-dg.exp (gfortran-dg-debug-runtest): Likewise.
+	* gfortran.dg/debug/pr37738.f: Also skip if -gdwarf-2 -g1.
+	* gfortran.dg/debug/pr35154-dwarf2.f: Likewise.
+
 2009-06-15  Rafael Avila de Espindola  <espindola@google.com>
 
 	* g++.dg/abi/mangle11.C: Update warning line.
diff --git a/gcc/testsuite/gfortran.dg/debug/pr35154-dwarf2.f b/gcc/testsuite/gfortran.dg/debug/pr35154-dwarf2.f
index b7586ea..bfd215d 100644
--- a/gcc/testsuite/gfortran.dg/debug/pr35154-dwarf2.f
+++ b/gcc/testsuite/gfortran.dg/debug/pr35154-dwarf2.f
@@ -1,6 +1,7 @@
 C     Test program for common block debugging.  G. Helffrich 11 July 2004.
 C { dg-do compile }
 C { dg-skip-if "DWARF-2 only" { "*-*-*" } { "*" } { "-gdwarf-2" } }
+C { dg-skip-if "DWARF-2 only" { "*-*-*" } { "-g1" } { "" } }
 C { dg-options "-dA" }
       common i,j
       common /label/l,m
diff --git a/gcc/testsuite/gfortran.dg/debug/pr37738.f b/gcc/testsuite/gfortran.dg/debug/pr37738.f
index b0a787b..48e1884 100644
--- a/gcc/testsuite/gfortran.dg/debug/pr37738.f
+++ b/gcc/testsuite/gfortran.dg/debug/pr37738.f
@@ -1,6 +1,7 @@
 C PR debug/37738
 C { dg-do compile }
 C { dg-skip-if "DWARF-2 only" { "*-*-*" } { "*" } { "-gdwarf-2" } }
+C { dg-skip-if "DWARF-2 only" { "*-*-*" } { "-g1" } { "" } }
 C { dg-options "-dA" }
 
       subroutine a
diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index e906265..98e2f66 100644
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -1,4 +1,4 @@
-#   Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008
+#   Copyright (C) 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -289,10 +289,18 @@ proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } {
 		    $comp_output] } {
 		remove-build-file "trivial.S"
 		foreach level {1 "" 3} {
-		    lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
-		    foreach opt $opt_opts {
-			lappend DEBUG_TORTURE_OPTIONS \
-				[list "${type}${level}" "$opt" ]
+		    if { ($type == "-gdwarf-2") && ($level != "") } {
+			lappend DEBUG_TORTURE_OPTIONS [list "${type}" "-g${level}"]
+			foreach opt $opt_opts {
+			    lappend DEBUG_TORTURE_OPTIONS \
+				    [list "${type}" "-g${level}" "$opt" ]
+			}
+		    } else {
+			lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
+			foreach opt $opt_opts {
+			    lappend DEBUG_TORTURE_OPTIONS \
+				    [list "${type}${level}" "$opt" ]
+			}
 		    }
 		}
 	    }
@@ -320,7 +328,8 @@ proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } {
 	    if { ([string match {*/debug-[126].c} "$nshort"] \
 		   || [string match {*/enum-1.c} "$nshort"] \
 		   || [string match {*/enum-[12].C} "$nshort"]) \
-		    && [string match "*1" [lindex "$flags" 0] ] } {
+		    && ([string match "*1" [lindex "$flags" 0] ]
+			|| [lindex "$flags" 1] == "-g1") } {
 		set doit 0
 	    }
 
diff --git a/gcc/testsuite/lib/gfortran-dg.exp b/gcc/testsuite/lib/gfortran-dg.exp
index 55d6d40..70a0888 100644
--- a/gcc/testsuite/lib/gfortran-dg.exp
+++ b/gcc/testsuite/lib/gfortran-dg.exp
@@ -135,10 +135,18 @@ proc gfortran-dg-debug-runtest { target_compile trivial opt_opts testcases } {
            }
            remove-build-file "trivial.S"
            foreach level {1 "" 3} {
-               lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
-               foreach opt $opt_opts {
-                   lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}" \
-                      "$opt" ]
+	       if { ($type == "-gdwarf-2") && ($level != "") } {
+		   lappend DEBUG_TORTURE_OPTIONS [list "${type}" "-g${level}"]
+		   foreach opt $opt_opts {
+		       lappend DEBUG_TORTURE_OPTIONS \
+			       [list "${type}" "-g${level}" "$opt" ]
+		   }
+	       } else {
+		   lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
+		   foreach opt $opt_opts {
+		       lappend DEBUG_TORTURE_OPTIONS \
+			       [list "${type}${level}" "$opt" ]
+		   }
                }
            }
        }