diff options
-rw-r--r-- | tests/ofproto.at | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/ofproto.at b/tests/ofproto.at index d5a13d0cf..2e6f4cbfe 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -3579,13 +3579,18 @@ table_desc:- AT_FAIL_IF([test X"$1" != X]) - OVS_WAIT_UNTIL([test `wc -l < "monitor.log"` -ge `wc -l < "expout"`]) + normalize_log () { + sed ' +s/ (xid=0x[[0-9a-fA-F]]*)// +s/ *duration.*// +s/00:0.$/00:0x/' < monitor.log + } + + OVS_WAIT_UNTIL([test `wc -l < "monitor.log"` -ge `wc -l < "expout"`], + [normalize_log | diff -u - expout]) AT_CHECK( - [[sed ' -s/ (xid=0x[0-9a-fA-F]*)// -s/ *duration.*// -s/00:0.$/00:0x/' < monitor.log]], + [normalize_log], [0], [expout]) } |