diff options
| author | Alexis Hildebrandt <afh@surryhill.net> | 2023-12-05 23:27:55 +0100 |
|---|---|---|
| committer | Alexis Hildebrandt <afh@surryhill.net> | 2023-12-05 23:27:55 +0100 |
| commit | ecbfaa9c2e6733d516351d0a815b4cd822bfed39 (patch) | |
| tree | 83af279c13a4a6d1032650aca4f7a2b21b49ad3e /test | |
| parent | 2c0cf2e0c933b16a107cc29451ad92d3a48bb481 (diff) | |
| parent | 1ab0add0afbd91624133141158349c3551c42a93 (diff) | |
| download | fork-ledger-ecbfaa9c2e6733d516351d0a815b4cd822bfed39.tar.gz fork-ledger-ecbfaa9c2e6733d516351d0a815b4cd822bfed39.tar.bz2 fork-ledger-ecbfaa9c2e6733d516351d0a815b4cd822bfed39.zip | |
Merge branch 'master' into modernize-test-scripts
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | test/baseline/feat-value_py.test (renamed from test/baseline/feat-value_py3.test) | 0 | ||||
| -rw-r--r-- | test/baseline/feat-value_py2.test | 23 |
3 files changed, 1 insertions, 32 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 559c757a..25d91a9e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -19,15 +19,7 @@ macro(add_ledger_harness_tests _class) file(GLOB ${_class}_TESTS *.test) foreach(TestFile ${${_class}_TESTS}) get_filename_component(TestFile_Name ${TestFile} NAME_WE) - string(FIND ${TestFile_Name} "_py" TestFile_IsPythonTest) - if ((TestFile_IsPythonTest GREATER -1)) - get_filename_component(TestFile_FullName ${TestFile} NAME) - string(FIND ${TestFile_FullName} "_py.test" TestFile_IsAnyPythonTest) - string(FIND ${TestFile_FullName} "_py${Python_VERSION_MAJOR}.test" TestFile_IsThisPythonTest) - if ((TestFile_IsAnyPythonTest EQUAL -1) AND (TestFile_IsThisPythonTest EQUAL -1)) - continue() - endif() - endif() + string(FIND ${TestFile_Name} "_py.test" TestFile_IsPythonTest) if ((TestFile_IsPythonTest EQUAL -1) OR HAVE_BOOST_PYTHON) add_test(NAME ${_class}Test_${TestFile_Name} COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/RegressTests.py diff --git a/test/baseline/feat-value_py3.test b/test/baseline/feat-value_py.test index f82fbf2b..f82fbf2b 100644 --- a/test/baseline/feat-value_py3.test +++ b/test/baseline/feat-value_py.test diff --git a/test/baseline/feat-value_py2.test b/test/baseline/feat-value_py2.test deleted file mode 100644 index 4378c91a..00000000 --- a/test/baseline/feat-value_py2.test +++ /dev/null @@ -1,23 +0,0 @@ -python - def print_type(val): - print(type(val), val) - -eval print_type(true) -eval print_type([2010/08/10]) -eval print_type(10) -eval print_type($10.00) -eval print_type($10.00 + CAD 30) -eval print_type("Hello!") -eval print_type(/Hello!/) -;eval print_type((1, 2, 3)) - -test reg -<type 'bool'> True -<type 'datetime.date'> 2010-08-10 -<class 'ledger.Amount'> 10 -<class 'ledger.Amount'> $10.00 -<class 'ledger.Balance'> $10.00 -CAD 30 -<type 'unicode'> Hello! -<class 'ledger.Value'> Hello! -end test |