From 6dc2f8eeada4e4e1b1fc29d69cb7cbdf1cd94061 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 31 Jul 2012 08:24:30 -0400 Subject: [PATCH] tests: Avoid xargs, for FreeBSD compatibility. The FreeBSD version of xargs does not run the utility argument on empty input, while GNU xargs runs it at least once, even with empty input. As a result on FreeBSD VSCTL_CHECK_FIND returned no output for an empty bridge list while on Linux it returned a single blank line. Signed-off-by: Ed Maste Signed-off-by: Ben Pfaff --- tests/ovs-vsctl.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ovs-vsctl.at b/tests/ovs-vsctl.at index 71c46cd4..a6c67498 100644 --- a/tests/ovs-vsctl.at +++ b/tests/ovs-vsctl.at @@ -769,7 +769,7 @@ AT_CHECK( ]) m4_define([VSCTL_CHECK_FIND], - [AT_CHECK([ovs-vsctl --bare --timeout=5 --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge '$1' | sort | xargs echo], [0], [$2 + [AT_CHECK([echo `ovs-vsctl --bare --timeout=5 --no-wait -vreconnect:emer --db=unix:socket -- --columns=name find bridge '$1' | sort`], [0], [$2 ])]) # Arithmetic relational operators without keys. -- 2.30.2