Source locations have function names

Author: tautschnig

regression/taint/aliasing1/test.desc

@@ -3,7 +3,7 @@ aliasing1.class
 --taint taint.json
 ^EXIT=0$
 ^SIGNAL=0$
-^file aliasing1.java line 10: There is a flow \(taint rule my_sink\)$
+^file aliasing1.java line 10( function .*)?: There is a flow \(taint rule my_sink\)$
 --
-^file aliasing1.java line 8: There is a flow \(taint rule my_sink\)$
+^file aliasing1.java line 8( function .*)?: There is a flow \(taint rule my_sink\)$
 ^warning: ignoring

regression/taint/basic1/test.desc

@@ -3,7 +3,7 @@ basic1.class
 --taint taint.json
 ^EXIT=0$
 ^SIGNAL=0$
-^file basic1.java line 8: There is a T1 flow \(taint rule my_h1\)$
-^file basic1.java line 11: There is a T2 flow \(taint rule my_h2\)$
+^file basic1.java line 8( function .*)?: There is a T1 flow \(taint rule my_h1\)$
+^file basic1.java line 11( function .*)?: There is a T2 flow \(taint rule my_h2\)$
 --
 ^warning: ignoring

regression/taint/basic2/test.desc

@@ -3,7 +3,7 @@ basic2.class
 --taint taint.json
 ^EXIT=0$
 ^SIGNAL=0$
-^file basic2.java line 8: There is a T1 flow \(taint rule my_h1\)$
-^file basic2.java line 11: There is a T2 flow \(taint rule my_h2\)$
+^file basic2.java line 8( function .*)?: There is a T1 flow \(taint rule my_h1\)$
+^file basic2.java line 11( function .*)?: There is a T2 flow \(taint rule my_h2\)$
 --
 ^warning: ignoring

regression/taint/interface1/test.desc

@@ -3,6 +3,6 @@ interface1.class
 --taint taint.json
 ^EXIT=0$
 ^SIGNAL=0$
-^file interface1.java line 18: There is a flow! \(taint rule sink_rule\)$
+^file interface1.java line 18( function .*)?: There is a flow! \(taint rule sink_rule\)$
 --
 ^warning: ignoring