From 3e9c5655b1280ac024e93a411c2281943cd9eb8b Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Fri, 15 Sep 2017 08:10:15 +0200 Subject: [PATCH] Added xargs fix to some more wc -l invocations Calling `xargs` removes any leading whitespace, which is introduced by the macOS version of `wc`. See https://stackoverflow.com/a/12973694/1228454 for more info. --- test/lib/helpers.bats | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats index fd38ad69..bf1865fa 100644 --- a/test/lib/helpers.bats +++ b/test/lib/helpers.bats @@ -258,17 +258,17 @@ function __migrate_all_components() { ls ${BASH_IT}/${subdirectory}/enabled - all_available=$(compgen -G "${BASH_IT}/${subdirectory}/available/*.$one_type.bash" | wc -l) - all_enabled_old=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l) + all_available=$(compgen -G "${BASH_IT}/${subdirectory}/available/*.$one_type.bash" | wc -l | xargs) + all_enabled_old=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l | xargs) assert_equal "$all_available" "$all_enabled_old" run bash-it migrate - all_enabled_old_after=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l) + all_enabled_old_after=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l | xargs) assert_equal "0" "$all_enabled_old_after" - all_enabled_new_after=$(compgen -G "${BASH_IT}/enabled/*.$one_type.bash" | wc -l) + all_enabled_new_after=$(compgen -G "${BASH_IT}/enabled/*.$one_type.bash" | wc -l | xargs) assert_equal "$all_enabled_old" "$all_enabled_new_after" }