From 512422696869fb5615f91cface74a634eb14ff54 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sat, 19 Jun 2021 15:52:54 +0200 Subject: testsuite/pyunit: add AllVHDLSources.sh --- testsuite/pyunit/dom/AllVHDLSources.sh | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 testsuite/pyunit/dom/AllVHDLSources.sh diff --git a/testsuite/pyunit/dom/AllVHDLSources.sh b/testsuite/pyunit/dom/AllVHDLSources.sh new file mode 100755 index 000000000..251b34163 --- /dev/null +++ b/testsuite/pyunit/dom/AllVHDLSources.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env bash + +cd $(dirname "$0")/../../.. + +gstart () { + printf "\e[36m> $@\e[0m\n" +} +gend () { + printf "$@\n" +} + +if [ -n "$CI" ]; then + gstart () { + printf '::group::' + printf "$@\n" + SECONDS=0 + } + + gend () { + duration=$SECONDS + echo '::endgroup::' + printf "$@\n" + } +fi + +for item in $(find ./ -type f -name "*.vhdl"); do + gstart "$item" + ./pyGHDL/cli/DOM.py $item \ + && gend '\e[32mpass\e[0m' \ + || gend '\e[31mfail\e[0m' +done -- cgit v1.2.3 From ee05ac37d1a78c899f9d48dcd45ee22e5a00f892 Mon Sep 17 00:00:00 2001 From: umarcor Date: Fri, 18 Jun 2021 03:06:00 +0200 Subject: ci: add MSYS2 jobs for testing DOM with AllVHDLSources.sh --- .github/workflows/Test.yml | 52 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index d36abf28b..e99314ba9 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -313,13 +313,63 @@ jobs: - name: '馃毀 Test package' run: GHDL=ghdl ./testsuite/testsuite.sh ${{ matrix.suite }} +# +# pyGHDL DOM Test +# + + DOM-test: + needs: win-build + runs-on: windows-latest + strategy: + fail-fast: false + max-parallel: 8 + matrix: + include: [ + {icon: '馃煢', installs: 'MINGW32', arch: i686, pkg: 'mcode' }, + #{icon: '馃煢', installs: "MINGW32", arch: i686, pkg: "llvm" }, ! Not yet functional + #{icon: '馃煪', installs: "MINGW64", arch: x86_64, pkg: "mcode" }, ! mcode is not yet supported on win64 + {icon: '馃煪', installs: 'MINGW64', arch: x86_64, pkg: 'llvm' }, + ] + name: '${{ matrix.icon }} DOM 路 ${{ matrix.installs }} 路 ${{ matrix.pkg }} 路 ${{ matrix.suite }}' + defaults: + run: + shell: msys2 {0} + steps: + + - name: '${{ matrix.icon }} Setup MSYS2' + uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.installs }} + update: true + install: > + mingw-w64-${{ matrix.arch }}-python-pip + mingw-w64-${{ matrix.arch }}-python-setuptools + + - name: '鈿欙笍 git config' + run: git config --global core.autocrlf input + shell: bash + + - name: '馃О Checkout' + uses: actions/checkout@v2 + + - name: '馃摜 Download artifact: package' + uses: actions/download-artifact@v2 + + - name: '馃毀 Install package and Python dependencies' + run: | + pacman --noconfirm -U artifact/mingw-w64-${{ matrix.arch }}-ghdl-${{ matrix.pkg }}-*.zst + pip3 install . + + - name: Test the DOM and pretty print all VHDL sources + run: ./testsuite/pyunit/dom/AllVHDLSources.sh + # # Release # Release: if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || contains(github.ref, 'refs/tags/')) - needs: [ doc, lin, osx, win-test ] + needs: [ doc, lin, osx, win-test, DOM-test ] runs-on: ubuntu-latest name: '馃摝 Release' steps: -- cgit v1.2.3 From 2033a3769eb75b7b8685385a8f0fe6597986d2fe Mon Sep 17 00:00:00 2001 From: umarcor Date: Sat, 19 Jun 2021 11:20:12 +0200 Subject: testsuite/pyunit/dom: replace AllVHDLSources.sh with AllSources.py --- .github/workflows/Test.yml | 52 +--------------------------------- testsuite/pyunit/dom/AllSources.py | 23 +++++++++++++++ testsuite/pyunit/dom/AllVHDLSources.sh | 31 -------------------- 3 files changed, 24 insertions(+), 82 deletions(-) create mode 100644 testsuite/pyunit/dom/AllSources.py delete mode 100755 testsuite/pyunit/dom/AllVHDLSources.sh diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index e99314ba9..d36abf28b 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -313,63 +313,13 @@ jobs: - name: '馃毀 Test package' run: GHDL=ghdl ./testsuite/testsuite.sh ${{ matrix.suite }} -# -# pyGHDL DOM Test -# - - DOM-test: - needs: win-build - runs-on: windows-latest - strategy: - fail-fast: false - max-parallel: 8 - matrix: - include: [ - {icon: '馃煢', installs: 'MINGW32', arch: i686, pkg: 'mcode' }, - #{icon: '馃煢', installs: "MINGW32", arch: i686, pkg: "llvm" }, ! Not yet functional - #{icon: '馃煪', installs: "MINGW64", arch: x86_64, pkg: "mcode" }, ! mcode is not yet supported on win64 - {icon: '馃煪', installs: 'MINGW64', arch: x86_64, pkg: 'llvm' }, - ] - name: '${{ matrix.icon }} DOM 路 ${{ matrix.installs }} 路 ${{ matrix.pkg }} 路 ${{ matrix.suite }}' - defaults: - run: - shell: msys2 {0} - steps: - - - name: '${{ matrix.icon }} Setup MSYS2' - uses: msys2/setup-msys2@v2 - with: - msystem: ${{ matrix.installs }} - update: true - install: > - mingw-w64-${{ matrix.arch }}-python-pip - mingw-w64-${{ matrix.arch }}-python-setuptools - - - name: '鈿欙笍 git config' - run: git config --global core.autocrlf input - shell: bash - - - name: '馃О Checkout' - uses: actions/checkout@v2 - - - name: '馃摜 Download artifact: package' - uses: actions/download-artifact@v2 - - - name: '馃毀 Install package and Python dependencies' - run: | - pacman --noconfirm -U artifact/mingw-w64-${{ matrix.arch }}-ghdl-${{ matrix.pkg }}-*.zst - pip3 install . - - - name: Test the DOM and pretty print all VHDL sources - run: ./testsuite/pyunit/dom/AllVHDLSources.sh - # # Release # Release: if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/master' || contains(github.ref, 'refs/tags/')) - needs: [ doc, lin, osx, win-test, DOM-test ] + needs: [ doc, lin, osx, win-test ] runs-on: ubuntu-latest name: '馃摝 Release' steps: diff --git a/testsuite/pyunit/dom/AllSources.py b/testsuite/pyunit/dom/AllSources.py new file mode 100644 index 000000000..645394742 --- /dev/null +++ b/testsuite/pyunit/dom/AllSources.py @@ -0,0 +1,23 @@ +from sys import executable +from subprocess import check_call, STDOUT +from pathlib import Path +from glob import glob +from pytest import mark + +if __name__ == "__main__": + print("ERROR: you called a testcase declaration file as an executable module.") + print("Use: 'python -m unitest '") + exit(1) + + +@mark.parametrize( + "file", + glob(str(Path(__file__).resolve().parent.parent.parent.parent / '**' / '*.vhdl'), recursive=True) +) +@mark.xfail +def test_AllVHDLSources(file): + check_call([ + executable, + str(Path(__file__).resolve().parent.parent.parent.parent / 'pyGHDL' / 'cli' / 'DOM.py'), + file + ], stderr=STDOUT) diff --git a/testsuite/pyunit/dom/AllVHDLSources.sh b/testsuite/pyunit/dom/AllVHDLSources.sh deleted file mode 100755 index 251b34163..000000000 --- a/testsuite/pyunit/dom/AllVHDLSources.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash - -cd $(dirname "$0")/../../.. - -gstart () { - printf "\e[36m> $@\e[0m\n" -} -gend () { - printf "$@\n" -} - -if [ -n "$CI" ]; then - gstart () { - printf '::group::' - printf "$@\n" - SECONDS=0 - } - - gend () { - duration=$SECONDS - echo '::endgroup::' - printf "$@\n" - } -fi - -for item in $(find ./ -type f -name "*.vhdl"); do - gstart "$item" - ./pyGHDL/cli/DOM.py $item \ - && gend '\e[32mpass\e[0m' \ - || gend '\e[31mfail\e[0m' -done -- cgit v1.2.3 From 4416285107eb5d59768ed29692cabdc684e407f5 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sat, 19 Jun 2021 21:42:24 +0200 Subject: testsuite/pyunit: add opts '-vs' to pytest call --- testsuite/testsuite.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/testsuite.sh b/testsuite/testsuite.sh index 8026af974..3408c2f4f 100755 --- a/testsuite/testsuite.sh +++ b/testsuite/testsuite.sh @@ -130,7 +130,7 @@ do_test() { pyunit) # The Python Unit testsuite: regression testsuite for Python bindings to libghdl gstart "[GHDL - test] pyunit" - PYTHONPATH=$(pwd)/.. ${PYTHON:-python3} -m pytest -rA pyunit + PYTHONPATH=$(pwd)/.. ${PYTHON:-python3} -m pytest -vsrA pyunit gend ;; -- cgit v1.2.3 From e145bdc8124a2418f31e044d00cec51c98906dc7 Mon Sep 17 00:00:00 2001 From: umarcor Date: Sat, 19 Jun 2021 12:30:02 +0200 Subject: pyGHDL: bump pyVHDLModel to 0.10.1 --- pyGHDL/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyGHDL/requirements.txt b/pyGHDL/requirements.txt index 0b7708418..d8892cfae 100644 --- a/pyGHDL/requirements.txt +++ b/pyGHDL/requirements.txt @@ -1,2 +1,2 @@ pydecor>=2.0.1 -pyVHDLModel>=0.10.0 +pyVHDLModel>=0.10.1 -- cgit v1.2.3