diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | contrib/non-profit-audit-reports/csv2ods.py | 2 | ||||
| -rwxr-xr-x | test/LedgerHarness.py | 4 | ||||
| -rwxr-xr-x | test/RegressTests.py | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e6b1270d..9b177afc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ set(Required_CMake_Version 3.16.2) set(Required_Boost_Version 1.72) set(Required_Gmp_Version 6.1.2) set(Required_Mpfr_Version 4.0.2) +set(Required_Icu_Version 63) set(Required_Python_Version 3.9) set(Required_Gpgmepp_Version 1.13.1) @@ -108,7 +109,7 @@ endif() ######################################################################## include(FindICU) -find_package(ICU 63 OPTIONAL_COMPONENTS uc i18n) +find_package(ICU ${Required_Icu_Version} OPTIONAL_COMPONENTS uc i18n) include(CheckIncludeFiles) include(CheckLibraryExists) diff --git a/contrib/non-profit-audit-reports/csv2ods.py b/contrib/non-profit-audit-reports/csv2ods.py index d2eda740..84a68e33 100755 --- a/contrib/non-profit-audit-reports/csv2ods.py +++ b/contrib/non-profit-audit-reports/csv2ods.py @@ -169,7 +169,7 @@ def csv2ods(csvname, odsname, encoding='', singleFileDirectory=None, knownChecks print(f'WARNING: link {val} DOES NOT EXIST at {linkpath}') if verbose: if os.path.exists(linkpath): - print('relative link {val} EXISTS at {linkpath}') + print(f'relative link {val} EXISTS at {linkpath}') else: if val == "pagebreak": doc.sheets[doc.sheet_index].set_sheet_config(('row', row), style_pagebreak) diff --git a/test/LedgerHarness.py b/test/LedgerHarness.py index e2c96894..95d0fe45 100755 --- a/test/LedgerHarness.py +++ b/test/LedgerHarness.py @@ -55,10 +55,10 @@ class LedgerHarness: def __init__(self, ledger, sourcepath, verify=False, gmalloc=False, python=False): if not ledger.is_file(): - print("Cannot find ledger at '{ledger}'", file=sys.stderr) + print(f"Cannot find ledger at '{ledger}'", file=sys.stderr) sys.exit(1) if not sourcepath.is_dir(): - print("Cannot find source path at '{sourcepath}'", file=sys.stderr) + print(f"Cannot find source path at '{sourcepath}'", file=sys.stderr) sys.exit(1) self.ledger = ledger.resolve() diff --git a/test/RegressTests.py b/test/RegressTests.py index 47abc3d0..1804d32e 100755 --- a/test/RegressTests.py +++ b/test/RegressTests.py @@ -27,6 +27,10 @@ args = parser.parse_args() multiproc &= (args.jobs >= 1) harness = LedgerHarness(args.ledger, args.sourcepath, args.verify, args.gmalloc, args.python) +match = re.match(r'(Baseline|Regress|Manual)Test_(.*)', str(args.tests)) +if match: + args.tests = pathlib.Path('test') / match.group(1).lower() / (match.group(2) + '.test') + if not args.tests.is_dir() and not args.tests.is_file(): print(f'{args.tests} is not a directory or file (cwd: {os.getcwd()})' , file=sys.stderr) |