[babeltrace] Port: don't quote wc output in test scripts
Commit Message
The 'wc' command on macOS prefixes the count it returns with spaces, if
we quote the output it won't be properly converted to integer for the
comparison.
Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
tests/cli/intersection/test_intersection.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Merged, thanks!
Jérémie
On 30 August 2017 at 14:29, Michael Jeanson <mjeanson at efficios.com> wrote:
> The 'wc' command on macOS prefixes the count it returns with spaces, if
> we quote the output it won't be properly converted to integer for the
> comparison.
>
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
> tests/cli/intersection/test_intersection.in | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/cli/intersection/test_intersection.in b/tests/cli/intersection/test_intersection.in
> index 07a267f..7cea9be 100644
> --- a/tests/cli/intersection/test_intersection.in
> +++ b/tests/cli/intersection/test_intersection.in
> @@ -26,9 +26,9 @@ test_intersect() {
> totalevents="$2"
> intersect="$3"
>
> - test "$("${BT_BIN}" "$trace" | wc -l)" = "$totalevents"
> + test $("${BT_BIN}" "$trace" | wc -l) = "$totalevents"
> ok $? "$totalevents events in the whole trace"
> - test "$("${BT_BIN}" --stream-intersection "$trace" 2>/dev/null| wc -l)" = "$intersect"
> + test $("${BT_BIN}" --stream-intersection "$trace" 2>/dev/null| wc -l) = "$intersect"
> ok $? "$intersect events in packets intersecting"
> }
>
> --
> 2.7.4
>
@@ -26,9 +26,9 @@ test_intersect() {
totalevents="$2"
intersect="$3"
- test "$("${BT_BIN}" "$trace" | wc -l)" = "$totalevents"
+ test $("${BT_BIN}" "$trace" | wc -l) = "$totalevents"
ok $? "$totalevents events in the whole trace"
- test "$("${BT_BIN}" --stream-intersection "$trace" 2>/dev/null| wc -l)" = "$intersect"
+ test $("${BT_BIN}" --stream-intersection "$trace" 2>/dev/null| wc -l) = "$intersect"
ok $? "$intersect events in packets intersecting"
}