From 385136472aacb5f5246b687f9bc4dab55b3f6cd4 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 22 Feb 2019 10:50:28 +0000
Subject: [PATCH 1/2] Fix exit/signal specifications in enum-trace1

The patterns were being used without anchoring to the beginning or end of the
line.
---
 regression/cbmc-cover/branch-loop1/test.desc       | 4 ++--
 regression/cbmc/enum-trace1/test_json.desc         | 4 ++--
 regression/cbmc/enum-trace1/test_xml.desc          | 4 ++--
 regression/cbmc/function-return-no-body1/test.desc | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/regression/cbmc-cover/branch-loop1/test.desc b/regression/cbmc-cover/branch-loop1/test.desc
index 5eacaa4e600..978d1bd0aee 100644
--- a/regression/cbmc-cover/branch-loop1/test.desc
+++ b/regression/cbmc-cover/branch-loop1/test.desc
@@ -2,8 +2,8 @@ CORE
 main.c
 --xml-ui --cover branch
 activate-multi-line-match
-EXIT=0
-SIGNAL=0
+^EXIT=0$
+^SIGNAL=0$
 </inputs>\n\s*<goal id="main\.coverage\.1"/>\n\s*<goal id="main\.coverage\.2"/>\n\s*<goal id="main\.coverage\.3"/>\n\s*<goal id="main\.coverage\.5"/>\n\s*</test>
 --
 ^warning: ignoring
diff --git a/regression/cbmc/enum-trace1/test_json.desc b/regression/cbmc/enum-trace1/test_json.desc
index e26c6134123..6619fc73eea 100644
--- a/regression/cbmc/enum-trace1/test_json.desc
+++ b/regression/cbmc/enum-trace1/test_json.desc
@@ -2,8 +2,8 @@ CORE
 main.c
 --json-ui --function test --trace
 activate-multi-line-match
-EXIT=10
-SIGNAL=0
+^EXIT=10$
+^SIGNAL=0$
 VERIFICATION FAILED
 \{\n\s*"hidden": false,\n\s*"inputID": "e",\n\s*"internal": true,\n\s*"mode": "C",\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"stepType": "input",\n\s*"thread": 0,\n\s*"values": \[\n\s*\{\n\s*"binary": "000000000000000000000000000000(0|1){2}",\n\s*"data": ".*E(1|2|3)",\n\s*"name": "integer",\n\s*"type": "enum",\n\s*"width": 32\n\s*\}\n\s*\]\n\s*\},
 \{\n\s*"hidden": false,\n\s*"inputID": "t",\n\s*"internal": true,\n\s*"mode": "C",\n\s*"sourceLocation": \{(\n.*)*\},\n\s*"stepType": "input",\n\s*"thread": 0,\n\s*"values": \[\n\s*\{\n\s*"binary": "000000000000000000000000000000(0|1){2}",\n\s*"data": ".*T(1|2|3)",\n\s*"name": "integer",\n\s*"type": "enum",\n\s*"width": 32\n\s*\}\n\s*\]\n\s*\},
diff --git a/regression/cbmc/enum-trace1/test_xml.desc b/regression/cbmc/enum-trace1/test_xml.desc
index 47e98cf549d..b0c3bf820f9 100644
--- a/regression/cbmc/enum-trace1/test_xml.desc
+++ b/regression/cbmc/enum-trace1/test_xml.desc
@@ -2,8 +2,8 @@ CORE
 main.c
 --xml-ui --function test --trace
 activate-multi-line-match
-EXIT=10
-SIGNAL=0
+^EXIT=10$
+^SIGNAL=0$
 VERIFICATION FAILED
 <input hidden="false" step_nr="\d+" thread="0">\n\s*<input_id>e</input_id>\n\s*<value>.*E(1|2|3)</value>\n\s*<value_expression>\n\s*<integer binary="000000000000000000000000000000(0|1){2}" c_type="enum" width="32">(0|1|2)</integer>\n\s*</value_expression>
 <input hidden="false" step_nr="\d+" thread="0">\n\s*<input_id>t</input_id>\n\s*<value>.*T(1|2|3)</value>\n\s*<value_expression>\n\s*<integer binary="000000000000000000000000000000(0|1){2}" c_type="enum" width="32">(0|1|2)</integer>\n\s*</value_expression>
diff --git a/regression/cbmc/function-return-no-body1/test.desc b/regression/cbmc/function-return-no-body1/test.desc
index fffcd09289b..a7f228211dc 100644
--- a/regression/cbmc/function-return-no-body1/test.desc
+++ b/regression/cbmc/function-return-no-body1/test.desc
@@ -2,8 +2,8 @@ CORE
 main.c
 --xml-ui
 activate-multi-line-match
-EXIT=10
-SIGNAL=0
+^EXIT=10$
+^SIGNAL=0$
 VERIFICATION FAILED
 <function_call hidden="false" step_nr="18" thread="0">\n\s*<function display_name="no_body" identifier="no_body">
 <function_return hidden="false" step_nr="19" thread="0">\n\s*<function display_name="no_body" identifier="no_body">

From 4ee0b9aa08632a752e90078a5170ac2d73fd1051 Mon Sep 17 00:00:00 2001
From: Michael Tautschnig <tautschn@amazon.com>
Date: Fri, 22 Feb 2019 09:41:34 +0000
Subject: [PATCH 2/2] Add Owen as code owner to analyses, pointer-analysis

Owen has already been an active reviewer despite not being a named code owner.
---
 CODEOWNERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index a11c70ec88d..16800b9630c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -33,8 +33,8 @@
 /src/solvers/refinement @martin-cs @romainbrenguier @peterschrammel
 /src/solvers/strings @martin-cs @romainbrenguier @peterschrammel
 /jbmc/src/java_bytecode/ @smowton @mgudemann @thk123 @cristina-david @cesaro @pkesseli @NathanJPhillips @peterschrammel
-/src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton @danpoe
-/src/pointer-analysis/ @martin-cs @peterschrammel @chrisr-diffblue @smowton
+/src/analyses/ @martin-cs @peterschrammel @chrisr-diffblue @thk123 @smowton @danpoe @owen-jones-diffblue
+/src/pointer-analysis/ @martin-cs @peterschrammel @chrisr-diffblue @smowton @owen-jones-diffblue
 
 
 # These files change frequently and changes are medium-risk