aa097b88e9
When we see a time like "noon", we pass "12" to our date_time() helper,
which sets the hour to 12pm. If the current time is before noon, then we
wrap around to yesterday using date_yesterday(). But unlike the normal
calls to date_yesterday() from approxidate_alpha(), we pass a NULL "num"
parameter. Since c27cc94fad (approxidate: handle pending number for
"specials", 2018-11-02), that causes a segfault.
One way to fix this is by checking for NULL. But arguably date_time() is
abusing our helper by passing NULL in the first place (and this is the
only case where one of these "special" parsers is used this way). So
instead, let's have it just do the 1-day subtraction itself. It's still
just a one-liner due to our update_tm() helper.
Note that the test added here is a little funny, as we say "10am noon",
which makes the "10am" seem pointless. But this bug can only be
triggered when it the currently-parsed hour is before the special time.
The latest special time is "tea" at 1700, but t0006 uses a hard-coded
TEST_DATE_NOW of 1900. We could reset TEST_DATE_NOW, but that may lead
to confusion in other tests. Just saying "10am noon" makes this test
self-contained.
Reported-by: Carlo Arenas <carenas@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
132 lines
4.6 KiB
Bash
Executable File
132 lines
4.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test date parsing and printing'
|
|
. ./test-lib.sh
|
|
|
|
# arbitrary reference time: 2009-08-30 19:20:00
|
|
TEST_DATE_NOW=1251660000; export TEST_DATE_NOW
|
|
|
|
check_relative() {
|
|
t=$(($TEST_DATE_NOW - $1))
|
|
echo "$t -> $2" >expect
|
|
test_expect_${3:-success} "relative date ($2)" "
|
|
test-tool date relative $t >actual &&
|
|
test_i18ncmp expect actual
|
|
"
|
|
}
|
|
|
|
check_relative 5 '5 seconds ago'
|
|
check_relative 300 '5 minutes ago'
|
|
check_relative 18000 '5 hours ago'
|
|
check_relative 432000 '5 days ago'
|
|
check_relative 1728000 '3 weeks ago'
|
|
check_relative 13000000 '5 months ago'
|
|
check_relative 37500000 '1 year, 2 months ago'
|
|
check_relative 55188000 '1 year, 9 months ago'
|
|
check_relative 630000000 '20 years ago'
|
|
check_relative 31449600 '12 months ago'
|
|
check_relative 62985600 '2 years ago'
|
|
|
|
check_show () {
|
|
format=$1
|
|
time=$2
|
|
expect=$3
|
|
prereqs=$4
|
|
zone=$5
|
|
test_expect_success $prereqs "show date ($format:$time)" '
|
|
echo "$time -> $expect" >expect &&
|
|
TZ=${zone:-$TZ} test-tool date show:"$format" "$time" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
}
|
|
|
|
# arbitrary but sensible time for examples
|
|
TIME='1466000000 +0200'
|
|
check_show iso8601 "$TIME" '2016-06-15 16:13:20 +0200'
|
|
check_show iso8601-strict "$TIME" '2016-06-15T16:13:20+02:00'
|
|
check_show rfc2822 "$TIME" 'Wed, 15 Jun 2016 16:13:20 +0200'
|
|
check_show short "$TIME" '2016-06-15'
|
|
check_show default "$TIME" 'Wed Jun 15 16:13:20 2016 +0200'
|
|
check_show raw "$TIME" '1466000000 +0200'
|
|
check_show unix "$TIME" '1466000000'
|
|
check_show iso-local "$TIME" '2016-06-15 14:13:20 +0000'
|
|
check_show raw-local "$TIME" '1466000000 +0000'
|
|
check_show unix-local "$TIME" '1466000000'
|
|
|
|
check_show 'format:%z' "$TIME" '+0200'
|
|
check_show 'format-local:%z' "$TIME" '+0000'
|
|
check_show 'format:%Z' "$TIME" ''
|
|
check_show 'format-local:%Z' "$TIME" 'UTC'
|
|
check_show 'format:%%z' "$TIME" '%z'
|
|
check_show 'format-local:%%z' "$TIME" '%z'
|
|
|
|
check_show 'format:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 16:13:20'
|
|
check_show 'format-local:%Y-%m-%d %H:%M:%S' "$TIME" '2016-06-15 09:13:20' '' EST5
|
|
|
|
# arbitrary time absurdly far in the future
|
|
FUTURE="5758122296 -0400"
|
|
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT
|
|
check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" TIME_IS_64BIT,TIME_T_IS_64BIT
|
|
|
|
check_parse() {
|
|
echo "$1 -> $2" >expect
|
|
test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" "
|
|
TZ=${3:-$TZ} test-tool date parse '$1' >actual &&
|
|
test_cmp expect actual
|
|
"
|
|
}
|
|
|
|
check_parse 2008 bad
|
|
check_parse 2008-02 bad
|
|
check_parse 2008-02-14 bad
|
|
check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000'
|
|
check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
|
|
check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015'
|
|
check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000'
|
|
check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000'
|
|
check_parse '2008-02-14 20:30:45 -05' '2008-02-14 20:30:45 -0500'
|
|
check_parse '2008-02-14 20:30:45 -:30' '2008-02-14 20:30:45 +0000'
|
|
check_parse '2008-02-14 20:30:45 -05:00' '2008-02-14 20:30:45 -0500'
|
|
check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5
|
|
|
|
check_approxidate() {
|
|
echo "$1 -> $2 +0000" >expect
|
|
test_expect_${3:-success} "parse approxidate ($1)" "
|
|
test-tool date approxidate '$1' >actual &&
|
|
test_cmp expect actual
|
|
"
|
|
}
|
|
|
|
check_approxidate now '2009-08-30 19:20:00'
|
|
check_approxidate '5 seconds ago' '2009-08-30 19:19:55'
|
|
check_approxidate 5.seconds.ago '2009-08-30 19:19:55'
|
|
check_approxidate 10.minutes.ago '2009-08-30 19:10:00'
|
|
check_approxidate yesterday '2009-08-29 19:20:00'
|
|
check_approxidate 3.days.ago '2009-08-27 19:20:00'
|
|
check_approxidate 3.weeks.ago '2009-08-09 19:20:00'
|
|
check_approxidate 3.months.ago '2009-05-30 19:20:00'
|
|
check_approxidate 2.years.3.months.ago '2007-05-30 19:20:00'
|
|
|
|
check_approxidate '6am yesterday' '2009-08-29 06:00:00'
|
|
check_approxidate '6pm yesterday' '2009-08-29 18:00:00'
|
|
check_approxidate '3:00' '2009-08-30 03:00:00'
|
|
check_approxidate '15:00' '2009-08-30 15:00:00'
|
|
check_approxidate 'noon today' '2009-08-30 12:00:00'
|
|
check_approxidate 'noon yesterday' '2009-08-29 12:00:00'
|
|
check_approxidate 'January 5th noon pm' '2009-01-05 12:00:00'
|
|
check_approxidate '10am noon' '2009-08-29 12:00:00'
|
|
|
|
check_approxidate 'last tuesday' '2009-08-25 19:20:00'
|
|
check_approxidate 'July 5th' '2009-07-05 19:20:00'
|
|
check_approxidate '06/05/2009' '2009-06-05 19:20:00'
|
|
check_approxidate '06.05.2009' '2009-05-06 19:20:00'
|
|
|
|
check_approxidate 'Jun 6, 5AM' '2009-06-06 05:00:00'
|
|
check_approxidate '5AM Jun 6' '2009-06-06 05:00:00'
|
|
check_approxidate '6AM, June 7, 2009' '2009-06-07 06:00:00'
|
|
|
|
check_approxidate '2008-12-01' '2008-12-01 19:20:00'
|
|
check_approxidate '2009-12-01' '2009-12-01 19:20:00'
|
|
|
|
test_done
|