Predicting the new ID value is not feasible and neither is implementing
support for regular expressions when matching monitor output, so simply
ignore them.
Also use diff option '-w' instead of '-Z' to ignore all whitespace, not
just at EOL.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
tests/monitor/run-tests.sh | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/monitor/run-tests.sh b/tests/monitor/run-tests.sh
index 7447adf1febd6..e21ed6880bc13 100755
--- a/tests/monitor/run-tests.sh
+++ b/tests/monitor/run-tests.sh
@@ -10,6 +10,9 @@ fi
trap "rm -rf $testdir" EXIT
nft=../../src/nft
+mydiff() {
+ diff -w -I '^# ' "$@"
+}
command_file=$(mktemp -p $testdir)
output_file=$(mktemp -p $testdir)
@@ -35,9 +38,9 @@ run_test() {
sleep 0.5
kill $monitor_pid
wait >/dev/null 2>&1
- if ! diff -Z -q $monitor_output $output_file >/dev/null 2>&1; then
+ if ! mydiff -q $monitor_output $output_file >/dev/null 2>&1; then
echo "monitor output differs!"
- diff -Z -u $output_file $monitor_output
+ mydiff -u $output_file $monitor_output
exit 1
fi
rm $command_file
--
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
