From 47a7c966bf3c8876226566b271612a3e1b58665e Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@nico-notebook.schottelius.org>
Date: Mon, 24 Jun 2019 13:20:20 +0200
Subject: [PATCH] Try matching different compiler output

---
 doc/plan.org            | 10 ++++++++++
 netpfga/do-all-steps.sh |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/plan.org b/doc/plan.org
index 9e9597e..96392e0 100644
--- a/doc/plan.org
+++ b/doc/plan.org
@@ -4850,6 +4850,16 @@ READ  0x44020044 = 0x0001
 success
 >>
 
+#+END_CENTER
+*** 2019-06-24: meeting laurent
+*** 2019-06-24: begin porting original code to netpfga
+#+BEGIN_CENTER
++ actual_line=actual   (tlast, tkeep, tdata) = (0, ffffffff, 000000000000000080fe403b0a0000000060dd86012222222208022222222208)
++ [ expected (tlast, tkeep, tdata) = (0, ffffffff, 000000000000000080fe403b0a0000000060dd86022222222208012222222208) != actual   (tlast, tkeep, tdata) = (0, ffffffff, 000000000000000080fe403b0a0000000060dd86012222222208022222222208) ]
++ echo packet mismatch
+packet mismatch
+
+
 #+END_CENTER
 ** References / Follow up
 *** RFC 791 IPv4 https://tools.ietf.org/html/rfc791
diff --git a/netpfga/do-all-steps.sh b/netpfga/do-all-steps.sh
index 2ea9999..6d30c7f 100755
--- a/netpfga/do-all-steps.sh
+++ b/netpfga/do-all-steps.sh
@@ -16,8 +16,8 @@ cd $P4_PROJECT_DIR && make
 # Step 5
 cd $P4_PROJECT_DIR/nf_sume_sdnet_ip/SimpleSumeSwitch && ./vivado_sim.bash 2>&1 | tee LOG
 
-expected_line=$(grep ^expected LOG | sed 's/.*= <//')
-actual_line=$(grep ^actual LOG     | sed 's/.*= <//')
+expected_line=$(grep ^expected LOG | sed -e 's/.*= <//' -e 's/.*= (//')
+actual_line=$(grep ^actual LOG     | sed -e 's/.*= <//' -e 's/.*= (//')
 
 
 if [ "$expected_line" != "$actual_line" ]; then