commit 1d56c8ea1e6e9a349a54c7dae99238fc4af94da5 from: Stefan Sperling via: Thomas Adam date: Mon Jun 13 17:55:22 2022 UTC adjust expected test output after got log -s changes ok op@ commit - 6a634b40ca714483871c4add8edac988c7fd89fb commit + 1d56c8ea1e6e9a349a54c7dae99238fc4af94da5 blob - 41cee9ee65ad11031857077637457e6954320463 blob + 7bdd9c2e0c5b082a18dcf878227aa026335384cf --- regress/cmdline/log.sh +++ regress/cmdline/log.sh @@ -311,14 +311,18 @@ test_log_oneline() { (cd $testroot/wt && got commit -m "test oneline no" > /dev/null) local commit_id1=`git_show_head $testroot/repo` + local author_time1=`git_show_author_time $testroot/repo` echo "modified beta" > $testroot/wt/beta (cd $testroot/wt && got commit -m " test oneline no" > /dev/null) local commit_id2=`git_show_head $testroot/repo` + local author_time2=`git_show_author_time $testroot/repo` - printf "%.7s test oneline\n" $commit_id2 > $testroot/stdout.expected - printf "%.7s test oneline\n" $commit_id1 >> $testroot/stdout.expected + d=`date -u -r $author_time1 +"%G-%m-%d"` + printf "$d %-7s test oneline\n" master > $testroot/stdout.expected + d=`date -u -r $author_time2 +"%G-%m-%d"` + printf "$d %.7s test oneline\n" $commit_id1 >> $testroot/stdout.expected (cd $testroot/repo && got log -s | head -n 2 > $testroot/stdout) cmp -s $testroot/stdout.expected $testroot/stdout