Index: polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll
===================================================================
--- polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll
+++ polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll
@@ -4,10 +4,9 @@
 ; Check that we allow this SCoP even though it has 10 parameters involved in posisbly aliasing accesses.
 ; However, only 7 are involved in accesses through B, 8 through C and none in accesses through A.
 ;
-; MAX8-LABEL:       Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
-; MAX8:  Function: jd
+; MAX8-LABEL:  Function: jd
+; MAX8-NEXT: Region: %for.cond---%for.end
 
-; MAX7-LABEL:       Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
 ; MAX7:  Invalid Scop!
 ;
 ;    void jd(int *A, int *B, int *C, long p1, long p2, long p3, long p4, long p5,
Index: polly/trunk/test/ScopInfo/branch-references-loop-scev-with-unknown-iterations.ll
===================================================================
--- polly/trunk/test/ScopInfo/branch-references-loop-scev-with-unknown-iterations.ll
+++ polly/trunk/test/ScopInfo/branch-references-loop-scev-with-unknown-iterations.ll
@@ -4,14 +4,7 @@
 ; RUN:     -polly-allow-nonaffine-branches=false < %s | \
 ; RUN:     FileCheck %s -check-prefix=NO-NONEAFFINE
 
-; NONAFFINE:      Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'branch => end' in function 'f':
-; NONAFFINE-NEXT: Invalid Scop!
-; NONAFFINE-NEXT: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'loop => branch' in function 'f':
-; NONAFFINE-NEXT: Invalid Scop!
-; NONAFFINE-NEXT: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'loop => end' in function 'f':
-; NONAFFINE-NEXT: Invalid Scop!
-; NONAFFINE-NEXT: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'entry => <Function Return>' in function 'f':
-; NONAFFINE-NEXT: Invalid Scop!
+; NONAFFINE-NOT: Statements
 
 ; NO-NONEAFFINE: Statements {
 ; NO-NONEAFFINE-NEXT: 	Stmt_then
Index: polly/trunk/test/ScopInfo/cond_in_loop.ll
===================================================================
--- polly/trunk/test/ScopInfo/cond_in_loop.ll
+++ polly/trunk/test/ScopInfo/cond_in_loop.ll
@@ -44,6 +44,5 @@
   ret void
 }
 
-; CHECK-LABEL: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'bb => return' in function 'f':
-; CHECK-NEXT:      Function: f
+; CHECK-LABEL:      Function: f
 ; CHECK-NEXT:      Region: %bb---%return
Index: polly/trunk/test/ScopInfo/fortran_array_param_nonmalloc_nonvectored.ll
===================================================================
--- polly/trunk/test/ScopInfo/fortran_array_param_nonmalloc_nonvectored.ll
+++ polly/trunk/test/ScopInfo/fortran_array_param_nonmalloc_nonvectored.ll
@@ -65,4 +65,4 @@
   ret void
 }
 
-; CHECK: MayWriteAccess := [Reduction Type: NONE] [Fortran array descriptor: xs] [Scalar: 0]
\ No newline at end of file
+; CHECK: MayWriteAccess := [Reduction Type: NONE] [Fortran array descriptor: xs] [Scalar: 0]
Index: polly/trunk/test/ScopInfo/integers.ll
===================================================================
--- polly/trunk/test/ScopInfo/integers.ll
+++ polly/trunk/test/ScopInfo/integers.ll
@@ -14,7 +14,8 @@
   store i1024 %indvar, i1024* %a, align 8
   %indvar.next = add nsw i1024 %indvar, 1
   %exitcond = icmp eq i1024 %indvar, 123456000000000000000000000
-; CHECK:  'bb => return' in function 'f'
+; CHECK-LABEL: Function: f
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK: i0 <= 123456000000000000000000000
   br i1 %exitcond, label %return, label %bb
 
@@ -33,7 +34,8 @@
   store i32 %indvar, i32* %scevgep, align 8
   %indvar.next = add nsw i32 %indvar, 1
   %exitcond = icmp eq i32 %indvar, 123456
-; CHECK:  'bb => return' in function 'f2'
+; CHECK-LABEL: Function: f2
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK: i0 <= 123456
   br i1 %exitcond, label %return, label %bb
 
@@ -53,7 +55,8 @@
   %indvar.next = add nsw i32 %indvar, 1
   %sub = sub i32 %n, 123456
   %exitcond = icmp eq i32 %indvar, %sub
-; CHECK:  'bb => return' in function 'f3'
+; CHECK-LABEL: Function: f3
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK: -123456
   br i1 %exitcond, label %return, label %bb
 
@@ -72,7 +75,8 @@
   store i1024 %indvar, i1024* %scevgep, align 8
   %indvar.next = add nsw i1024 %indvar, 1
   %sub = sub i1024 %n, 123456000000000000000000000000000000
-; CHECK:  'bb => return' in function 'f4'
+; CHECK-LABEL: Function: f4
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK: -123456000000000000000000000000000000
   %exitcond = icmp eq i1024 %indvar, %sub
   br i1 %exitcond, label %return, label %bb
@@ -91,7 +95,8 @@
   store i1023 %indvar, i1023* %scevgep, align 8
   %indvar.next = add nsw i1023 %indvar, 1
   %sub = sub i1023 %n, 123456000000000000000000000000000000
-; CHECK:  'bb => return' in function 'f5'
+; CHECK-LABEL: Function: f5
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK: -123456000000000000000000000000000000
   %exitcond = icmp eq i1023 %indvar, %sub
   br i1 %exitcond, label %return, label %bb
@@ -111,7 +116,8 @@
   store i3 %indvar, i3* %scevgep, align 8
   %indvar.next = add nsw i3 %indvar, 1
   %sub = sub i3 %n, 3
-; CHECK-LABEL:  'bb => return' in function 'f6'
+; CHECK-LABEL: Function: f6
+; CHECK-NEXT: Region: %bb---%return
 ; CHECK:         Context:
 ; CHECK-NEXT:    [n] -> {  : -4 <= n <= 3 }
 ; CHECK-NEXT:    Assumed Context:
Index: polly/trunk/test/ScopInfo/licm_load.ll
===================================================================
--- polly/trunk/test/ScopInfo/licm_load.ll
+++ polly/trunk/test/ScopInfo/licm_load.ll
@@ -49,6 +49,6 @@
 ;
 ; CHECK: Statements {
 ; CHECK:      Stmt_for_body
-; CHECK-DAG:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
+; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
 ; CHECK-NEXT:        [n, j] -> { Stmt_for_body[i0] -> MemRef_A[i0] };
 ; CHECK:     }
Index: polly/trunk/test/ScopInfo/undef_in_cond.ll
===================================================================
--- polly/trunk/test/ScopInfo/undef_in_cond.ll
+++ polly/trunk/test/ScopInfo/undef_in_cond.ll
@@ -19,4 +19,4 @@
   ret void
 }
 
-; CHECK: Invalid Scop!
+; CHECK-NOT: Function: