Index: tests/raii/.expect/memberCtors-ERR1.txt
===================================================================
--- tests/raii/.expect/memberCtors-ERR1.txt	(revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c)
+++ tests/raii/.expect/memberCtors-ERR1.txt	(revision 17129659db6e6e36c5f0d4f584aece6ea825536a)
@@ -1,1 +1,1 @@
-error: in void ?{}(B &b), field a2 used before being constructed
+raii/memberCtors.cfa:71:1 error: in void ?{}(B &b), field a2 used before being constructed
Index: tests/warnings/.expect/self-assignment.txt
===================================================================
--- tests/warnings/.expect/self-assignment.txt	(revision b5cff2b64b43663f9c57bc2ae5a4d68f7d2f2a3c)
+++ tests/warnings/.expect/self-assignment.txt	(revision 17129659db6e6e36c5f0d4f584aece6ea825536a)
@@ -1,11 +1,11 @@
-warning: self assignment of expression: Generated Cast of:
+warnings/self-assignment.cfa:29:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: j: signed int
 ... to:
   reference to signed int
-warning: self assignment of expression: Generated Cast of:
+warnings/self-assignment.cfa:30:1 warning: self assignment of expression: Generated Cast of:
   Variable Expression: s: instance of struct S with body 1
 ... to:
   reference to instance of struct S with body 1
-warning: self assignment of expression: Generated Cast of:
+warnings/self-assignment.cfa:31:1 warning: self assignment of expression: Generated Cast of:
   Member Expression, with field:
     i: signed int
@@ -14,5 +14,5 @@
 ... to:
   reference to signed int
-warning: self assignment of expression: Generated Cast of:
+warnings/self-assignment.cfa:32:1 warning: self assignment of expression: Generated Cast of:
   Member Expression, with field:
     i: signed int