From 191670c2318feddc068d2d25f91f09f8dac26fbe Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sat, 22 May 2010 00:52:45 +0000 Subject: [PATCH] tools: update paths in func. tests --- Makefile | 2 +- tests/add-bad-date-fails.test | 2 +- tests/add-blank-date.test | 2 +- tests/add-blank-description-fails.test | 2 +- tests/add-default-amount-precision.test | 2 +- tests/comment-line-after-postings.test | 2 +- tests/commented-posting.test | 2 +- tests/commodities.test | 4 ++-- tests/commodityless-amount-with-price.test | 2 +- tests/decimals-balance-failure.test | 2 +- tests/effective-balance.test | 2 +- tests/effective-date.test | 2 +- tests/effective-print-2.test | 2 +- tests/effective-print.test | 2 +- tests/effective-register.test | 2 +- tests/eliding-balance.test | 2 +- tests/eliding-print.test.notimplemented | 2 +- tests/eliding-register.test.notimplemented | 2 +- tests/extra-date-slash.test | 2 +- tests/filter-patterns.test | 4 ++-- tests/null-accountname-component.test | 2 +- tests/parens-in-account-name.test | 2 +- tests/parse-blank-description.test | 4 ++-- tests/parse-dates.test | 4 ++-- tests/parse-ledger-sample.test | 2 +- tests/price-history.test | 2 +- tests/pricing.tests | 8 ++++---- tests/print-desc-pattern.test | 2 +- tests/print-long-account.test | 2 +- tests/print-posting-comment.test | 2 +- tests/print-preserves-comments.test | 2 +- tests/register-depth-empty.test | 2 +- tests/register-depth.test | 2 +- tests/register-posting-comment.test | 2 +- tests/reporting-intervals.test | 8 ++++---- tests/sample-balance-depth.test | 2 +- tests/sample-balance-o.test | 2 +- tests/sample-balance.test | 2 +- tests/set-price-to-balance.test.unimplemented | 2 +- tests/timelog.test | 2 +- tests/unbalanced.test | 2 +- tests/unicode-account-matching.test | 2 +- tests/unicode-balance.test | 2 +- tests/unicode-description-matching.test | 2 +- tests/unicode-error-message.test | 2 +- tests/unicode-print.test | 2 +- tests/unicode-register.test | 2 +- tests/virtual.test | 10 +++++----- tests/zero-handling.test | 2 +- 49 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Makefile b/Makefile index 5f13c199c..70fde3a3f 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,7 @@ hlinttest hlint: unittest: unittest-builtin unittest-builtin: hledger - @(./hledger test -v \ + @(bin/hledger test -v \ && echo $@ passed) || echo $@ FAILED # XXX doesn't rebuild on hledger source changes diff --git a/tests/add-bad-date-fails.test b/tests/add-bad-date-fails.test index eb57d3280..dc1fbaa3c 100644 --- a/tests/add-bad-date-fails.test +++ b/tests/add-bad-date-fails.test @@ -1,5 +1,5 @@ # add should prompt again when it gets a bad date -./hledger -f nosuch.ledger add +bin/hledger -f nosuch.ledger add <<< 2009/1/32 >>>2 /date .*: date .*/ diff --git a/tests/add-blank-date.test b/tests/add-blank-date.test index f6b345fe5..7abfd01db 100644 --- a/tests/add-blank-date.test +++ b/tests/add-blank-date.test @@ -1,4 +1,4 @@ -./hledger -f nosuch.ledger add +bin/hledger -f nosuch.ledger add <<< >>>2 /date .*: description/ diff --git a/tests/add-blank-description-fails.test b/tests/add-blank-description-fails.test index 23bc7982b..10ddb7f4d 100644 --- a/tests/add-blank-description-fails.test +++ b/tests/add-blank-description-fails.test @@ -1,4 +1,4 @@ -./hledger -f nosuch.ledger add +bin/hledger -f nosuch.ledger add <<< diff --git a/tests/add-default-amount-precision.test b/tests/add-default-amount-precision.test index daf19d583..24a68f0fe 100644 --- a/tests/add-default-amount-precision.test +++ b/tests/add-default-amount-precision.test @@ -1,5 +1,5 @@ # add's default amounts should not fail to balance due to precision -./hledger -f nosuch.ledger add +bin/hledger -f nosuch.ledger add <<< 2010/1/1 x diff --git a/tests/comment-line-after-postings.test b/tests/comment-line-after-postings.test index 0667f4900..0246a7343 100644 --- a/tests/comment-line-after-postings.test +++ b/tests/comment-line-after-postings.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009/01/01 x a 1 diff --git a/tests/commented-posting.test b/tests/commented-posting.test index cbb73d1be..190dbb0ee 100644 --- a/tests/commented-posting.test +++ b/tests/commented-posting.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009/01/01 x ; comment line within postings diff --git a/tests/commodities.test b/tests/commodities.test index 34596042c..117608ece 100644 --- a/tests/commodities.test +++ b/tests/commodities.test @@ -1,6 +1,6 @@ # a commodity may contain/end with numbers, if double quoted # 1. without quotes, fail. XXX parse error should be clearer here -./hledger -f- print +bin/hledger -f- print <<< 2010-04-05 x a 10 DE0002635307 @@ -8,7 +8,7 @@ >>>2 /parse error.*unexpected "0"/ >>>= 1 # 2. with quotes -./hledger -f- print +bin/hledger -f- print <<< 2010-04-05 x a 10 "DE0002635307" diff --git a/tests/commodityless-amount-with-price.test b/tests/commodityless-amount-with-price.test index 4bd4e6942..d11a265dc 100644 --- a/tests/commodityless-amount-with-price.test +++ b/tests/commodityless-amount-with-price.test @@ -1,5 +1,5 @@ # a no-commodity amount with a price should work -./hledger -f - print +bin/hledger -f - print <<< 2010/1/1 x a 1 @ $2 diff --git a/tests/decimals-balance-failure.test b/tests/decimals-balance-failure.test index 1f93e2cef..edf1f71b1 100644 --- a/tests/decimals-balance-failure.test +++ b/tests/decimals-balance-failure.test @@ -1,5 +1,5 @@ # b amount with no decimal places, in middle, causes balance failure (0.6.1) -./hledger -f - print +bin/hledger -f - print <<< 2009/1/1 x a $1.25 diff --git a/tests/effective-balance.test b/tests/effective-balance.test index 3176f3df9..552145d04 100644 --- a/tests/effective-balance.test +++ b/tests/effective-balance.test @@ -1,4 +1,4 @@ -./hledger -f - balance -p 'in 2009' --effective +bin/hledger -f - balance -p 'in 2009' --effective <<< 2009/1/1 x a 1 diff --git a/tests/effective-date.test b/tests/effective-date.test index df7ad85d5..e93018c7f 100644 --- a/tests/effective-date.test +++ b/tests/effective-date.test @@ -1,5 +1,5 @@ # -./hledger -f - print --effective +bin/hledger -f - print --effective <<< 2009/1/1=1/2 x a 1 diff --git a/tests/effective-print-2.test b/tests/effective-print-2.test index 6f5f2da2b..fd69daa95 100644 --- a/tests/effective-print-2.test +++ b/tests/effective-print-2.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009/1/1=2010/1/1 x a 1 diff --git a/tests/effective-print.test b/tests/effective-print.test index 01ed36e6e..37bb0fdbc 100644 --- a/tests/effective-print.test +++ b/tests/effective-print.test @@ -1,4 +1,4 @@ -./hledger -f - print --effective +bin/hledger -f - print --effective <<< 2009/1/1=2010/1/1 x a 1 diff --git a/tests/effective-register.test b/tests/effective-register.test index 6eb0d13e2..b41c0a1ca 100644 --- a/tests/effective-register.test +++ b/tests/effective-register.test @@ -1,4 +1,4 @@ -./hledger -f - register --effective +bin/hledger -f - register --effective <<< 2009/1/1=2010/1/1 x a 1 diff --git a/tests/eliding-balance.test b/tests/eliding-balance.test index f12bd50f0..c736b129e 100644 --- a/tests/eliding-balance.test +++ b/tests/eliding-balance.test @@ -1,4 +1,4 @@ -./hledger -f - balance +bin/hledger -f - balance <<< 2009/1/1 x aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa €1 diff --git a/tests/eliding-print.test.notimplemented b/tests/eliding-print.test.notimplemented index ab8dab2b6..bb4624e6c 100644 --- a/tests/eliding-print.test.notimplemented +++ b/tests/eliding-print.test.notimplemented @@ -1,4 +1,4 @@ -./hledger -f- print +bin/hledger -f- print <<< 2009/1/1 x aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa €1 diff --git a/tests/eliding-register.test.notimplemented b/tests/eliding-register.test.notimplemented index 477a9339a..be86a664e 100644 --- a/tests/eliding-register.test.notimplemented +++ b/tests/eliding-register.test.notimplemented @@ -1,4 +1,4 @@ -./hledger -f- register +bin/hledger -f- register <<< 2009/1/1 x aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa:aaaaaaaaaaaaaaaaaaaa €1 b diff --git a/tests/extra-date-slash.test b/tests/extra-date-slash.test index a5c1d6f21..64d0f518d 100644 --- a/tests/extra-date-slash.test +++ b/tests/extra-date-slash.test @@ -1,5 +1,5 @@ # an extra slash before [ silently disables the effective date in 0.6.1 -./hledger -f - print --effective -p 2009/1/2 +bin/hledger -f - print --effective -p 2009/1/2 <<< 2009/1/1/[=2009/1/2] x a 1 diff --git a/tests/filter-patterns.test b/tests/filter-patterns.test index f44375251..32a35e881 100644 --- a/tests/filter-patterns.test +++ b/tests/filter-patterns.test @@ -1,5 +1,5 @@ # 1. account pattern with space -./hledger -f- register 'a a' +bin/hledger -f- register 'a a' <<< 2010/3/1 x a a 1 @@ -8,7 +8,7 @@ 2010/03/01 x a a 1 1 # # 2. description pattern with space -./hledger -f- register desc:'x x' +bin/hledger -f- register desc:'x x' <<< 2010/3/1 x a 1 diff --git a/tests/null-accountname-component.test b/tests/null-accountname-component.test index 4de97efdd..29d92fb1d 100644 --- a/tests/null-accountname-component.test +++ b/tests/null-accountname-component.test @@ -1,4 +1,4 @@ -./hledger -f - balance -E +bin/hledger -f - balance -E <<< 2009/1/1 x a: 13 diff --git a/tests/parens-in-account-name.test b/tests/parens-in-account-name.test index 0cd2cad47..cc52b22f4 100644 --- a/tests/parens-in-account-name.test +++ b/tests/parens-in-account-name.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009-01-01 x a 2 diff --git a/tests/parse-blank-description.test b/tests/parse-blank-description.test index aeb179fa3..b81ab12d1 100644 --- a/tests/parse-blank-description.test +++ b/tests/parse-blank-description.test @@ -1,11 +1,11 @@ # 1. accept a blank description -./hledger -f- +bin/hledger -f- <<< 2010/1/1 a 1 b # 2. same, but no separator space after the date -./hledger -f- +bin/hledger -f- <<< 2010/1/1 a 1 diff --git a/tests/parse-dates.test b/tests/parse-dates.test index 79ebec712..38de0e61c 100644 --- a/tests/parse-dates.test +++ b/tests/parse-dates.test @@ -1,12 +1,12 @@ # dates with bad month or day numbers should be rejected -./hledger -f- print +bin/hledger -f- print <<< 2010/31/12 x a 1 b >>>2 /bad month number: 31/ >>>= 1 -./hledger -f- print +bin/hledger -f- print <<< 2010/12/32 x a 1 diff --git a/tests/parse-ledger-sample.test b/tests/parse-ledger-sample.test index 3f6f56341..d63d81ae5 100644 --- a/tests/parse-ledger-sample.test +++ b/tests/parse-ledger-sample.test @@ -1,4 +1,4 @@ -./hledger -f- +bin/hledger -f- <<< ; -*- ledger -*- diff --git a/tests/price-history.test b/tests/price-history.test index c74e5ae1c..7eb05c6ff 100644 --- a/tests/price-history.test +++ b/tests/price-history.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< P 2009/1/1 p 0.5h diff --git a/tests/pricing.tests b/tests/pricing.tests index 74f92025e..28169a0ce 100644 --- a/tests/pricing.tests +++ b/tests/pricing.tests @@ -1,6 +1,6 @@ # draft pricing tests # 1. print a transaction with explicitly-priced amount -./hledger -f- print +bin/hledger -f- print <<< 2009/1/2 x expenses:foreign currency €100 @ $1.35 @@ -11,7 +11,7 @@ assets $-135.00 # 2. again, this time converting to cost basis -./hledger -f- print -B +bin/hledger -f- print -B <<< 2009/1/2 x expenses:foreign currency €100 @ $1.35 @@ -22,7 +22,7 @@ assets $-135.00 # 3. same as above, but using a historical price directive -./hledger -f- print +bin/hledger -f- print <<< P 2009/1/1 € $1.35 @@ -36,7 +36,7 @@ P 2009/1/1 € $1.35 assets €-100 @ $1.35 # 4. and with conversion -./hledger -f- print -B +bin/hledger -f- print -B <<< P 2009/1/1 € $1.35 diff --git a/tests/print-desc-pattern.test b/tests/print-desc-pattern.test index 386b0af0f..9f0f94d2c 100644 --- a/tests/print-desc-pattern.test +++ b/tests/print-desc-pattern.test @@ -1,4 +1,4 @@ -./hledger -f - print desc:x +bin/hledger -f - print desc:x <<< 2009/1/1 x a 1 diff --git a/tests/print-long-account.test b/tests/print-long-account.test index 6b6466afa..8c203b7cc 100644 --- a/tests/print-long-account.test +++ b/tests/print-long-account.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009/1/1 x aaaaabbbbbcccccdddddeeeeefffffggggghhhhh 1 diff --git a/tests/print-posting-comment.test b/tests/print-posting-comment.test index 5d3132676..6a9959379 100644 --- a/tests/print-posting-comment.test +++ b/tests/print-posting-comment.test @@ -1,5 +1,5 @@ # a posting comment should appear in print -./hledger -f - print +bin/hledger -f - print <<< 2010/01/01 x a 1 ; comment diff --git a/tests/print-preserves-comments.test b/tests/print-preserves-comments.test index 11e901b62..8d8d1adf0 100644 --- a/tests/print-preserves-comments.test +++ b/tests/print-preserves-comments.test @@ -1,6 +1,6 @@ # let's have print preserve comments as far as possible # we preserve line-end comments but not full line comments -./hledger -f - print +bin/hledger -f - print <<< 2009/1/1 x ; description comment a 1 ; amount comment diff --git a/tests/register-depth-empty.test b/tests/register-depth-empty.test index 5b012add2..5cbf678ec 100644 --- a/tests/register-depth-empty.test +++ b/tests/register-depth-empty.test @@ -1,4 +1,4 @@ -./hledger -f - register --depth 1 --empty --monthly +bin/hledger -f - register --depth 1 --empty --monthly <<< 2010/1/1 x a:aa 1 diff --git a/tests/register-depth.test b/tests/register-depth.test index d663ad8b6..b78829579 100644 --- a/tests/register-depth.test +++ b/tests/register-depth.test @@ -1,4 +1,4 @@ -./hledger -f - register --depth 1 +bin/hledger -f - register --depth 1 <<< 2010/1/1 x a:aa 1 diff --git a/tests/register-posting-comment.test b/tests/register-posting-comment.test index 7c3e9a9cb..c4ee7b82b 100644 --- a/tests/register-posting-comment.test +++ b/tests/register-posting-comment.test @@ -1,5 +1,5 @@ # a posting comment should not appear in register -./hledger -f - register +bin/hledger -f - register <<< 2010/1/1 x a 1 ; comment diff --git a/tests/reporting-intervals.test b/tests/reporting-intervals.test index 74afb7794..05bb6486a 100644 --- a/tests/reporting-intervals.test +++ b/tests/reporting-intervals.test @@ -1,6 +1,6 @@ # # monthly reporting interval, no end dates, shows just the intervals with data: -./hledger -f- register --period 'monthly' +bin/hledger -f- register --period 'monthly' <<< 2010/2/1 x a 1 @@ -10,7 +10,7 @@ b -1 0 # # with --empty, the same: -./hledger -f- register --period 'monthly' --empty +bin/hledger -f- register --period 'monthly' --empty <<< 2010/2/1 x a 1 @@ -20,7 +20,7 @@ b -1 0 # # with --empty and start/end dates, show all intervals covering the specified period -./hledger -f- register --period 'monthly from 2010/1/10 to 2010/3/15' --empty +bin/hledger -f- register --period 'monthly from 2010/1/10 to 2010/3/15' --empty <<< 2010/2/1 x a 1 @@ -32,7 +32,7 @@ 2010/03/01 - 2010/03/31 0 0 # # with just one start/end date, get the other from the data -./hledger -f- register --period 'monthly from 2010/1/10' --empty +bin/hledger -f- register --period 'monthly from 2010/1/10' --empty <<< 2010/2/1 x a 1 diff --git a/tests/sample-balance-depth.test b/tests/sample-balance-depth.test index fa459e0ab..2c9daa416 100644 --- a/tests/sample-balance-depth.test +++ b/tests/sample-balance-depth.test @@ -1,4 +1,4 @@ -./hledger -f sample.ledger balance --depth 1 +bin/hledger -f data/sample.ledger balance --depth 1 >>> $-1 assets $2 expenses diff --git a/tests/sample-balance-o.test b/tests/sample-balance-o.test index 10a44542c..e14d48303 100644 --- a/tests/sample-balance-o.test +++ b/tests/sample-balance-o.test @@ -1,4 +1,4 @@ -./hledger -f sample.ledger balance o +bin/hledger -f data/sample.ledger balance o >>> $1 expenses:food $-2 income diff --git a/tests/sample-balance.test b/tests/sample-balance.test index b259c9868..de93e7a54 100644 --- a/tests/sample-balance.test +++ b/tests/sample-balance.test @@ -1,4 +1,4 @@ -./hledger -f sample.ledger balance +bin/hledger -f data/sample.ledger balance >>> $-1 assets $1 bank:saving diff --git a/tests/set-price-to-balance.test.unimplemented b/tests/set-price-to-balance.test.unimplemented index af990c0d9..39d6c9b5c 100644 --- a/tests/set-price-to-balance.test.unimplemented +++ b/tests/set-price-to-balance.test.unimplemented @@ -1,5 +1,5 @@ # should infer prices to balance this - not implemented -./hledger -f - print +bin/hledger -f - print <<< 2009/1/1 opening balance Assets:Brokerage 1 AAPL diff --git a/tests/timelog.test b/tests/timelog.test index d677e41a4..9badea48d 100644 --- a/tests/timelog.test +++ b/tests/timelog.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< i 2009/1/1 08:00:00 x o 2009/1/1 09:00:00 diff --git a/tests/unbalanced.test b/tests/unbalanced.test index 9f335c13f..f9c7834ee 100644 --- a/tests/unbalanced.test +++ b/tests/unbalanced.test @@ -1,4 +1,4 @@ -./hledger -f - register +bin/hledger -f - register <<< 2009/1/1 a b 1.1 diff --git a/tests/unicode-account-matching.test b/tests/unicode-account-matching.test index f4c310382..2f2369ab4 100644 --- a/tests/unicode-account-matching.test +++ b/tests/unicode-account-matching.test @@ -1,4 +1,4 @@ -./hledger -f - register τράπ +bin/hledger -f - register τράπ <<< 2009-01-01 проверка τράπεζα 10 руб diff --git a/tests/unicode-balance.test b/tests/unicode-balance.test index e1469f3fc..18369a4fb 100644 --- a/tests/unicode-balance.test +++ b/tests/unicode-balance.test @@ -1,4 +1,4 @@ -./hledger -f - balance +bin/hledger -f - balance <<< 2009-01-01 проверка τράπεζα 10 руб diff --git a/tests/unicode-description-matching.test b/tests/unicode-description-matching.test index 666bcf60d..10d6a76a9 100644 --- a/tests/unicode-description-matching.test +++ b/tests/unicode-description-matching.test @@ -1,4 +1,4 @@ -./hledger -f - register desc:аура +bin/hledger -f - register desc:аура <<< 2009-01-01 аура (cyrillic letters) bank 10 diff --git a/tests/unicode-error-message.test b/tests/unicode-error-message.test index b8c145428..48b968b3e 100644 --- a/tests/unicode-error-message.test +++ b/tests/unicode-error-message.test @@ -1,4 +1,4 @@ -./hledger -f - balance +bin/hledger -f - balance <<< 2009-01-01 broken entry дебит 1 diff --git a/tests/unicode-print.test b/tests/unicode-print.test index 4f7519aab..c9d02733c 100644 --- a/tests/unicode-print.test +++ b/tests/unicode-print.test @@ -1,4 +1,4 @@ -./hledger -f - print +bin/hledger -f - print <<< 2009-01-01 проверка счёт:первый 1 diff --git a/tests/unicode-register.test b/tests/unicode-register.test index bb2585010..c49e1c2ae 100644 --- a/tests/unicode-register.test +++ b/tests/unicode-register.test @@ -1,4 +1,4 @@ -./hledger -f - register +bin/hledger -f - register <<< 2009-01-01 проверка τράπεζα 10 руб diff --git a/tests/virtual.test b/tests/virtual.test index 6c84105cb..d57203205 100644 --- a/tests/virtual.test +++ b/tests/virtual.test @@ -1,5 +1,5 @@ # 1. virtual posting shouldn't affect balance -./hledger -f- +bin/hledger -f- <<< 2009/1/1 x (virtual) 100 @@ -7,7 +7,7 @@ b # # 2. balanced virtual postings should be required to balance (themselves) -./hledger -f- +bin/hledger -f- <<< 2010/1/1 x [balanced virtual] 10 @@ -16,7 +16,7 @@ >>>= !0 # # 3. balanced virtual postings should be required to balance (themselves) -./hledger -f- +bin/hledger -f- <<< 2010/1/1 x [balanced virtual] 10 @@ -25,14 +25,14 @@ b # # 4. a virtual posting with implicit amount should be handled correctly -./hledger -f- +bin/hledger -f- <<< 2010/1/1 x [a] 10 [b] # # 5. real and balanced virtual postings are balanced separately, and multiple blank virtuals are ok -./hledger -f- +bin/hledger -f- <<< 2010/1/1 x a 1 diff --git a/tests/zero-handling.test b/tests/zero-handling.test index 1baad6749..7876f7f10 100644 --- a/tests/zero-handling.test +++ b/tests/zero-handling.test @@ -1,6 +1,6 @@ # a zero amount is always displayed as just "0", regardless of any commodity/decimal places/price (like ledger) # -./hledger -f- print --empty +bin/hledger -f- print --empty <<< 2010/3/1 x a $0.00 @ 3EUR