dg.exp: Exclude debug subdir, it has its own .exp.

	* g++.dg/dg.exp: Exclude debug subdir, it has its own .exp.
	* g++.dg/debug/debug.exp: New.
	* g++.dg/debug/trivial.C: New.
	* g++.dg/debug/debug1.C: Moved...
	* g++.dg/other/debug1.C: ...from here.
	* g++.dg/debug/debug2.C: Moved...
	* g++.dg/other/debug2.C: ...from here.
	* g++.dg/debug/debug3.C: Moved...
	* g++.dg/other/debug3.C: ...from here.

From-SVN: r49766

7 files changed, 98 insertions, 6 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b139854f046..2cf855f2060 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,15 @@
 2002-02-14  Jakub Jelinek  <jakub@redhat.com>
 
+	* g++.dg/dg.exp: Exclude debug subdir, it has its own .exp.
+	* g++.dg/debug/debug.exp: New.
+	* g++.dg/debug/trivial.C: New.
+	* g++.dg/debug/debug1.C: Moved...
+	* g++.dg/other/debug1.C: ...from here.
+	* g++.dg/debug/debug2.C: Moved...
+	* g++.dg/other/debug2.C: ...from here.
+	* g++.dg/debug/debug3.C: Moved...
+	* g++.dg/other/debug3.C: ...from here.
+
 	* gcc.dg/noncompile/20020213-1.c: New test.
 
 2002-02-13  Jakub Jelinek  <jakub@redhat.com>
diff --git a/gcc/testsuite/g++.dg/debug/debug.exp b/gcc/testsuite/g++.dg/debug/debug.exp
new file mode 100644
index 00000000000..662217951cb
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/debug.exp
@@ -0,0 +1,78 @@
+#   Copyright (C) 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+
+# G++ testsuite that uses the `dg.exp' driver.
+
+# Load support procs.
+load_lib g++-dg.exp
+
+# This is the list of debugging options we'll try.  Some of them won't
+# be supported, that's OK; they will be quickly eliminated.
+# It's probably not a good idea to add more optimisation options.
+
+if ![info exists DEBUG_TORTURE_OPTIONS] {
+    set DEBUG_TORTURE_OPTIONS ""
+    foreach type {-gdwarf-2 -gstabs -gstabs+ -gxcoff -gxcoff+ -gcoff} {
+	set comp_output [g++_target_compile \
+		"$srcdir/$subdir/trivial.C" "trivial.S" assembly \
+		"additional_flags=$type"]
+	if { ! [string match "*: unknown or unsupported -g option*" \
+		$comp_output] } {
+	    foreach level {1 "" 3} {
+		lappend DEBUG_TORTURE_OPTIONS [list "${type}${level}"]
+		foreach opt { -O2 -O3 } {
+		    lappend DEBUG_TORTURE_OPTIONS \
+			    [list "${type}${level}" "$opt" ]
+		}
+	    }
+	}
+    }
+}
+
+verbose -log "Using options $DEBUG_TORTURE_OPTIONS"
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+
+foreach test [lsort [glob -nocomplain $srcdir/$subdir/*.C]] {
+    global runtests
+
+    # If we're only testing specific files and this isn't one of 
+    # them, skip it.
+    if ![runtest_file_p $runtests $test] {
+	continue
+    }
+
+    set nshort [file tail [file dirname $test]]/[file tail $test]
+
+    foreach flags $DEBUG_TORTURE_OPTIONS {
+	set doit 1
+	# if { [string match {*/debug-[126].c} "$nshort"] \
+	#	&& [string match "*1" [lindex "$flags" 0] ] } { 
+	#    set doit 0
+	# }
+	
+	if { $doit } {
+	    verbose -log "Testing $nshort, $flags" 1
+	    dg-test $test $flags ""
+	}
+    }
+}
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/g++.dg/other/debug1.C b/gcc/testsuite/g++.dg/debug/debug1.C
index c284e23212a..3efcbc98f42 100644
--- a/gcc/testsuite/g++.dg/other/debug1.C
+++ b/gcc/testsuite/g++.dg/debug/debug1.C
@@ -1,6 +1,5 @@
 // Test whether dwarf2 debug info works with named return value optimization
-// { dg-do compile { target i?86-*-linux* } }
-// { dg-options "-O2 -gdwarf-2" }
+// { dg-do compile }
 
 struct S
 {
diff --git a/gcc/testsuite/g++.dg/other/debug2.C b/gcc/testsuite/g++.dg/debug/debug2.C
index 6260f5b7d50..e0164202d13 100644
--- a/gcc/testsuite/g++.dg/other/debug2.C
+++ b/gcc/testsuite/g++.dg/debug/debug2.C
@@ -1,7 +1,6 @@
 /* Verify that sched re-inserts needed scopes properly.  */
 /* { dg-do compile } */
-/* { dg-options "-O2 -g" } */
-/* { dg-options "-O2 -g -mcpu=ev5" { target alpha*-*-* } } */
+/* { dg-options "-mcpu=ev5" { target alpha*-*-* } } */
 
 template <class T>
 inline void foo()
diff --git a/gcc/testsuite/g++.dg/other/debug3.C b/gcc/testsuite/g++.dg/debug/debug3.C
index 8525eef9199..91ef35dc096 100644
--- a/gcc/testsuite/g++.dg/other/debug3.C
+++ b/gcc/testsuite/g++.dg/debug/debug3.C
@@ -2,7 +2,7 @@
 // This testcase caused ICE on IA-32, since DWARF-2 was unable
 // to emit location expression for parameter a of operator+.
 // { dg-do compile }
-// { dg-options "-O2 -g -fpic" }
+// { dg-options "-fpic" }
 
 struct A { char *s; };
 
diff --git a/gcc/testsuite/g++.dg/debug/trivial.C b/gcc/testsuite/g++.dg/debug/trivial.C
new file mode 100644
index 00000000000..5b125eca91f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/trivial.C
@@ -0,0 +1,6 @@
+/* { dg-do run } */
+
+int main(void)
+{
+  return 0;
+}
diff --git a/gcc/testsuite/g++.dg/dg.exp b/gcc/testsuite/g++.dg/dg.exp
index 6667d672cfa..169d7225446 100644
--- a/gcc/testsuite/g++.dg/dg.exp
+++ b/gcc/testsuite/g++.dg/dg.exp
@@ -31,7 +31,7 @@ dg-init
 # Gather a list of all tests, excluding those in special/; those are handled
 # well, specially.
 set all [lsort [find $srcdir/$subdir *.C]]
-set tests [prune $all $srcdir/$subdir/special/*]
+set tests [prune [prune $all $srcdir/$subdir/special/*] $srcdir/$subdir/debug/*]
 
 # Main loop.
 dg-runtest $tests "" $DEFAULT_CXXFLAGS