[PATCH, testsuite]: Committed: Cleanup various dumps

[Uros Bizjak <ubizjak at gmail dot com>]

Hello!

This patch just cleans up various dumps from the test run directory.

2008-08-22  Uros Bizjak  <ubizjak@gmail.com>
   * gcc.dg/tree-ssa/pr21658.c (dg-options): Use -fdump-tree-ccp1-details.
   (dg-final): Use cleanup-tree-dump "ccp1".
   * gcc.dg/tree-prof/ic-misattribution-1a.c: Cleanup tree_profile.
   * gcc.dg/ipa/iinline-1.c: Cleanup ipa dump, not tree dump.
   * g++.dg/ipa/iinline-1.C: Ditto.
   * gfortran.dg/intrinsic_std_1.f90: Cleanup "original" tree dump.
   * gfortran.dg/char_eoshift_5.f90: Ditto.
   * gfortran.dg/index_2.f90: Ditto.

Tested on x86_64-pc-linux-gnu, committed to mainline.

Uros.
Index: gcc.dg/tree-ssa/pr21658.c
===================================================================
--- gcc.dg/tree-ssa/pr21658.c	(revision 139494)
+++ gcc.dg/tree-ssa/pr21658.c	(working copy)
@@ -3,7 +3,7 @@
    statement below from being folded.  */
 
 /* { dg-do compile } */
-/* { dg-options "-O2 -fno-tree-dominator-opts -fdump-tree-ccp-details" } */
+/* { dg-options "-O2 -fno-tree-dominator-opts -fdump-tree-ccp1-details" } */
 
 void link_error (void);
 
@@ -18,4 +18,4 @@
 }
 
 /* { dg-final { scan-tree-dump-times "Folded into: if " 1 "ccp1"} } */
-/* { dg-final { cleanup-tree-dump "ccp\[1-2\]" } } */
+/* { dg-final { cleanup-tree-dump "ccp1" } } */
Index: gcc.dg/tree-prof/ic-misattribution-1a.c
===================================================================
--- gcc.dg/tree-prof/ic-misattribution-1a.c	(revision 139494)
+++ gcc.dg/tree-prof/ic-misattribution-1a.c	(working copy)
@@ -18,3 +18,5 @@
 #endif
   return 0;
 }
+
+/* { dg-final-use { cleanup-tree-dump "tree_profile" } } */
Index: gcc.dg/ipa/iinline-1.c
===================================================================
--- gcc.dg/ipa/iinline-1.c	(revision 139494)
+++ gcc.dg/ipa/iinline-1.c	(working copy)
@@ -23,4 +23,4 @@
 }
 
 /* { dg-final { scan-ipa-dump "hooray\[^\\n\]*inline copy in main"  "inline"  } } */
-/* { dg-final { cleanup-tree-dump "inline" } } */
+/* { dg-final { cleanup-ipa-dump "inline" } } */
Index: g++.dg/ipa/iinline-1.C
===================================================================
--- g++.dg/ipa/iinline-1.C	(revision 139494)
+++ g++.dg/ipa/iinline-1.C	(working copy)
@@ -44,4 +44,4 @@
 }
 
 /* { dg-final { scan-ipa-dump "String::funcOne\[^\\n\]*inline copy in int main"  "inline"  } } */
-/* { dg-final { cleanup-tree-dump "inline" } } */
+/* { dg-final { cleanup-ipa-dump "inline" } } */
Index: gfortran.dg/intrinsic_std_1.f90
===================================================================
--- gfortran.dg/intrinsic_std_1.f90	(revision 139494)
+++ gfortran.dg/intrinsic_std_1.f90	(working copy)
@@ -46,3 +46,4 @@
 ! { dg-final { scan-tree-dump " abort " "original" } }
 ! { dg-final { scan-tree-dump " asinh " "original" } }
 ! { dg-final { scan-tree-dump " acosh " "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
Index: gfortran.dg/char_eoshift_5.f90
===================================================================
--- gfortran.dg/char_eoshift_5.f90	(revision 139494)
+++ gfortran.dg/char_eoshift_5.f90	(working copy)
@@ -22,3 +22,4 @@
 
 ! Check that _gfortran_eoshift* is called with 8 arguments:
 ! { dg-final { scan-tree-dump "_gfortran_eoshift\[0-9_\]+char \\(\[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*, \[&a-zA-Z0-9._\]*\\)" "original" } }
+! { dg-final { cleanup-tree-dump "original" } }
Index: gfortran.dg/index_2.f90
===================================================================
--- gfortran.dg/index_2.f90	(revision 139494)
+++ gfortran.dg/index_2.f90	(working copy)
@@ -53,3 +53,4 @@
 
 ! { dg-final { scan-tree-dump-times "if ..integer.kind=1.. _gfortran_string_index" 6 "original" } }
 ! { dg-final { scan-tree-dump-times "if ..integer.kind=1.. _gfortran_string_scan" 6 "original" } }
+! { dg-final { cleanup-tree-dump "original" } }