From e0c7697cbcb56fde7aa725772eae75d15aa80403 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Mon, 30 Jul 2012 20:34:52 +0000 Subject: [PATCH] tests: Handle different output formats for 'wc -l'. FreeBSD's wc outputs leading whitespace before the count, so use test(1) for numeric equality instead of AC_CHECK string match. Signed-off-by: Ed Maste Signed-off-by: Ben Pfaff --- tests/ovsdb-server.at | 8 ++++---- tests/ovsdb-tool.at | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index f5db1a8d..b81878c4 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -322,8 +322,8 @@ dnl We can't fully re-check the contents of the database log, because the dnl order of the records is not predictable, but there should only be 4 lines dnl in it now. AT_CAPTURE_FILE([db]) -AT_CHECK([wc -l < db], [0], [4 -], [], [test ! -e pid || kill `cat pid`]) +AT_CHECK([test `wc -l < db` -eq 4], [0], [], [], + [test ! -e pid || kill `cat pid`]) dnl And check that the dumped data is the same too: AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) @@ -348,8 +348,8 @@ AT_CHECK( [0], [[[{"count":3}] ]], [ignore], [test ! -e pid || kill `cat pid`]) dnl There should be 6 lines in the log now. -AT_CHECK([wc -l < db], [0], [6 -], [], [test ! -e pid || kill `cat pid`]) +AT_CHECK([test `wc -l < db` -eq 6], [0], [], [], + [test ! -e pid || kill `cat pid`]) dnl Then check that the dumped data is correct. AT_CHECK([ovsdb-client dump unix:socket ordinals], [0], [stdout], [ignore], [test ! -e pid || kill `cat pid`]) diff --git a/tests/ovsdb-tool.at b/tests/ovsdb-tool.at index 2d19b32d..87949bbb 100644 --- a/tests/ovsdb-tool.at +++ b/tests/ovsdb-tool.at @@ -121,8 +121,7 @@ dnl We can't fully re-check the contents of the database log, because the dnl order of the records is not predictable, but there should only be 4 lines dnl in it now. AT_CAPTURE_FILE([db]) -AT_CHECK([wc -l < db], [0], [4 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same too: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) @@ -185,8 +184,7 @@ dnl We can't fully re-check the contents of the database log, because the dnl order of the records is not predictable, but there should only be 4 lines dnl in it now. AT_CAPTURE_FILE([db]) -AT_CHECK([wc -l < db], [0], [4 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the removed column: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) @@ -248,8 +246,7 @@ dnl We can't fully re-check the contents of the database log, because the dnl order of the records is not predictable, but there should only be 4 lines dnl in it now. AT_CAPTURE_FILE([db]) -AT_CHECK([wc -l < db], [0], [4 -]) +AT_CHECK([test `wc -l < db` -eq 4]) dnl And check that the dumped data is the same except for the added column: AT_CHECK([[ovsdb-server --unixctl="`pwd`"/unixctl --remote=punix:socket --run "ovsdb-client dump unix:socket ordinals" db]], [0], [stdout], [ignore]) -- 2.30.2