Get "make functest" working again

This commit is contained in:
Brian Wignall 2020-01-06 10:41:00 -05:00 committed by Simon Michael
parent 28f9f043e5
commit e12b0a4f05
3 changed files with 15 additions and 15 deletions

View File

@ -13,52 +13,52 @@
# If this one fails, we got a wrong regex and the inverted regex tests below
# are also wrong.
$ hledger -f- register
> /2019\/01\/01/
> /2019-01-01/
# Show only February
$ hledger -f- register -p 2019-02
> !/2019\/01\/01/
> !/2019-01-01/
# The last -b overrides the first -b
# -> show only February
$ hledger -f- register -b 2019 -b 2019-02
> !/2019\/01\/01/
> !/2019-01-01/
# The last -e overrides the first -e
# Note that -e means: include posting/txns BEFORE this date.
# -> show only January
$ hledger -f- register -e 2020 -e 2019-02-01
> !/2019\/02\/01/
> !/2019-02-01/
# -p's begin overrides -b because it comes last
# -> show only February
$ hledger -f- register -b 2019-01-01 -p 2019-02
> !/2019\/01\/01/
> !/2019-01-01/
# -e overrides -p's end because it come last
# -> show only first part of January
$ hledger -f- register -p 2019 -e 2019-01-20
> !/2019\/02\/01/
> !/2019-02-01/
# Date options and queries are AND'ed and produce the intersection independent
# of their order
$ hledger -f- register date:2019-02 -p 2019
> !/2019\/01\/01/
> !/2019-01-01/
$ hledger -f- register -p 2019 date:2019-02
> !/2019\/01\/01/
> !/2019-01-01/
# Date queries are AND'ed and produce the intersection independent of their
# order
$ hledger -f- register date:2019 date:2019-02
> !/2019\/01\/01/
> !/2019-01-01/
$ hledger -f- register date:2019-02 date:2019
> !/2019\/01\/01/
> !/2019-01-01/
$ hledger -f- register date:2019-02 date:2019-01-01-
> !/2019\/01\/01/
> !/2019-01-01/
## Date options override date queries
#$ hledger -f- register date:2019-02 -p 2019
#> /2019\/01\/01/
#> /2019-01-01/
# Smart dates https://github.com/simonmichael/hledger/issues/1079
$ hledger -f- activity -b 2019-02-01 -e 'next year'

View File

@ -539,7 +539,7 @@ account1 (assets:myacct)
separator TAB
$ ./hledger-csv
2009/10/01 Flubber Co
2009-10-01 Flubber Co
(assets:myacct) $50 = $123
>=0

View File

@ -5,7 +5,7 @@ hledger -f- register
<<<
2000/1/2
a 0 ; date: 3/4, date: 4-5, date:6.7
>>> /^2000\/03\/04/
>>> /^2000-03-04/
>>>=0
# 2. If the date: or date2: tags do not have a valid simple date
@ -33,7 +33,7 @@ hledger -f- register --date2
<<<
2000/1/2
a 0 ; [=3-4]
>>> /^2000\/03\/04/
>>> /^2000-03-04/
>>>=0
# 4. Date parsing and error reporting activates for square brackets