This is v2 containing the patches not applied from v1. Apart from rebasing upon current upstream master, I folded patch 4 into patch 1 since they really belong together: The code changes to make 'nft monitor' print correct syntax (by including the mandatory semicolons) harmed readability since it dropped whitespace from the output. Former patch 4 resolved this, not only for the cases patch 1 broke, but also at another spot (i.e. between 'type' attribute and the following ones). Patch 2 of this series depends on patch 1 since the simplification requires that 'nft monitor' output matches given input (apart from whitespace change) which wasn't the case before patch 1. Finally, patch 3 (along with patch 2) remains unchanged. Phil Sutter (3): monitor: Fix printing of set declarations tests/monitor: Simplify testcases tests/monitor: Clear ruleset after testing src/rule.c | 8 ++++---- tests/monitor/run-tests.sh | 15 ++++++++++----- tests/monitor/testcases/set-maps.t | 7 +++---- tests/monitor/testcases/set-mixed.t | 10 +++------- tests/monitor/testcases/set-multiple.t | 7 ++----- tests/monitor/testcases/set-simple.t | 21 ++++++++------------- 6 files changed, 30 insertions(+), 38 deletions(-) -- 2.13.1 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
