commit 8d5e51600db687f15110fd0b7c1b044fe8c33b90 from: Omar Polo via: Thomas Adam date: Sat Jan 07 15:21:02 2023 UTC regress: replace echo \n with printf and heredoc echo \n is not really portable. Not that it matters since the regress suite is already using non-POSIX features (like `local'). However, it's the only place using it and easy to fix. ok jamsek commit - 964791552c389e02f2af2bca06d3cd0fa0d0a187 commit + 8d5e51600db687f15110fd0b7c1b044fe8c33b90 blob - 314a026727f96334dde35583720d4743cbbf2a75 blob + 0bd7331ffb2355312432cbbab9ac303f0991738d --- regress/cmdline/log.sh +++ regress/cmdline/log.sh @@ -859,7 +859,7 @@ test_log_diffstat() { return 1 fi - echo "modified\nalpha." > $testroot/wt/alpha + printf "modified\nalpha.\n" > $testroot/wt/alpha (cd $testroot/wt && got commit -m 'log_diffstat mod file' > /dev/null) (cd $testroot/wt && got rm beta >/dev/null) @@ -873,23 +873,25 @@ test_log_diffstat() { (cd $testroot/wt && got log -d | grep -A2 '^ [MDmA]' | sed '/^--/d' > \ $testroot/stdout) - echo " A new | 1+ 0-" > $testroot/stdout.expected - echo "\n1 file changed, 1 insertions(+), 0 deletions(-)" >> \ - $testroot/stdout.expected - echo " D beta | 0+ 1-" >> $testroot/stdout.expected - echo " m epsilon/zeta | 0+ 0-" >> $testroot/stdout.expected - echo "\n2 files changed, 0 insertions(+), 1 deletions(-)" >> \ - $testroot/stdout.expected - echo " M alpha | 2+ 1-" >> $testroot/stdout.expected - echo "\n1 file changed, 2 insertions(+), 1 deletions(-)" >> \ - $testroot/stdout.expected - echo " A alpha | 1+ 0-" >> $testroot/stdout.expected - echo " A beta | 1+ 0-" >> $testroot/stdout.expected - echo " A epsilon/zeta | 1+ 0-" >> $testroot/stdout.expected - echo " A gamma/delta | 1+ 0-" >> $testroot/stdout.expected - echo "\n4 files changed, 4 insertions(+), 0 deletions(-)" >> \ - $testroot/stdout.expected + cat <$testroot/stdout.expected + A new | 1+ 0- +1 file changed, 1 insertions(+), 0 deletions(-) + D beta | 0+ 1- + m epsilon/zeta | 0+ 0- + +2 files changed, 0 insertions(+), 1 deletions(-) + M alpha | 2+ 1- + +1 file changed, 2 insertions(+), 1 deletions(-) + A alpha | 1+ 0- + A beta | 1+ 0- + A epsilon/zeta | 1+ 0- + A gamma/delta | 1+ 0- + +4 files changed, 4 insertions(+), 0 deletions(-) +EOF + cmp -s $testroot/stdout.expected $testroot/stdout ret=$? if [ $ret -ne 0 ]; then