diff options
| author | Alexis Hildebrandt <afh@surryhill.net> | 2023-12-05 22:27:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-05 22:27:15 +0000 |
| commit | 1ab0add0afbd91624133141158349c3551c42a93 (patch) | |
| tree | 8d2773b2b51bfdd5713651c7f71a57d98eafca54 | |
| parent | 14db8c8f10377607c85a7fe449af8001a64f088e (diff) | |
| parent | cf8fd54ebb5b043e20044224d3f2ad6ddc896e2f (diff) | |
| download | fork-ledger-1ab0add0afbd91624133141158349c3551c42a93.tar.gz fork-ledger-1ab0add0afbd91624133141158349c3551c42a93.tar.bz2 fork-ledger-1ab0add0afbd91624133141158349c3551c42a93.zip | |
Merge pull request #2310 from afh/remove-py2-tests
test: Remove Python2 specific tests
| -rw-r--r-- | .github/workflows/cmake.yml | 2 | ||||
| -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 |
4 files changed, 2 insertions, 33 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 62674d77..8d3456ad 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -53,7 +53,7 @@ jobs: brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done brew update - brew install boost boost-python3 gmp mpfr gpgme + brew install --force --overwrite boost boost-python3 gmp mpfr icu4c gpgme - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 301959db..30ee993f 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 |