From 2c44f79277c8becabf33799ca962d7f38ad7caf1 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sun, 8 Aug 2021 10:00:31 -0400 Subject: [PATCH] tests: Make sed/wc calls in tw-2563 compatible with OS-X' The sed does not support -i flag in the same way. The wc -l prints whitespace in front, which needs to be stripped. --- test/tw-2563.t | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/tw-2563.t b/test/tw-2563.t index 2636fc2b8..e60c9dbb7 100755 --- a/test/tw-2563.t +++ b/test/tw-2563.t @@ -8,8 +8,9 @@ task add Actionable task wait:yesterday task add Non-actionable task wait:tomorrow+1h # Simulate this was created in 2.5.3 or earlier (status is equal to waiting, -# not pending) -sed -i 's/pending/waiting/' $TASKDATA/pending.data +# not pending). Using more cumbersome sed syntax for Mac OS-X compatibility. +sed -i".bak" 's/pending/waiting/g' $TASKDATA/pending.data +rm -f $TASKDATA/pending.data.bak # Trigger upgrade task all @@ -39,5 +40,6 @@ cat $TASKDATA/completed.data [[ -z `cat $TASKDATA/completed.data | grep waiting` ]] # Assertion: No tasks were moved into completed.data -[[ `cat $TASKDATA/pending.data | wc -l` == "2" ]] -[[ `cat $TASKDATA/completed.data | wc -l` == "0" ]] +cat $TASKDATA/pending.data | wc -l | tr -d ' ' +[[ `cat $TASKDATA/pending.data | wc -l | tr -d ' '` == "2" ]] +[[ `cat $TASKDATA/completed.data | wc -l | tr -d ' '` == "0" ]]