Merge pull request chipsalliance#114 from antmicro/mczyz/top-verifica…

…tion-move Move irq test to top directory
antmicro · Sep 5, 2023 · 774510e · 774510e
2 parents de5c444 + 0115d45
commit 774510e
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/test-verification.yml b/.github/workflows/test-verification.yml
@@ -85,13 +85,13 @@ jobs:
           echo "RV_ROOT=$RV_ROOT" >> $GITHUB_ENV
           PYTHONUNBUFFERED=1
           echo "PYTHONUNBUFFERED=$PYTHONUNBUFFERED" >> $GITHUB_ENV
-          TEST_PATH=$RV_ROOT/verification/${{ matrix.test }}
+          TEST_PATH=$RV_ROOT/verification/top/${{ matrix.test }}
           echo "TEST_PATH=$TEST_PATH" >> $GITHUB_ENV
 
       - name: Run ${{ matrix.test }}
         run: |
           pip3 install meson
-          pip3 install -r $RV_ROOT/verification/requirements.txt
+          pip3 install -r $RV_ROOT/verification/top/requirements.txt
           PYTEST_STYLE_SRC_DIR=${{ github.workspace }}/.github/scripts/pytest/
           PYTEST_CSS=${PYTEST_STYLE_SRC_DIR}/css/styles.css
           HTML_FILE=${{ matrix.test }}_${{ matrix.COVERAGE }}.html

diff --git a/verification/README.md → verification/top/README.md b/verification/README.md → verification/top/README.md
@@ -16,7 +16,7 @@ Remember to set the `RV_ROOT` environment variable, which is required to generat
 
 ### Prepare python virtual environment
 
-    cd $RV_ROOT/verification
+    cd $RV_ROOT/verification/top
     python -m venv venv
     source venv/bin/activate
     pip install -r requirements.txt
@@ -35,7 +35,7 @@ Each PyUVM test can be either run from a pytest wrapper or directly from a Makef
 
 In `test_pyuvm` directory, a `Makefile` and a wrapper `test_pyuvm.py` are placed.
 
-    ./verification/
+    ./verification/top/
     └── test_pyuvm
         ├── Makefile
         ├── test_pyuvm.py ⟵ pytest wrapper

diff --git a/verification/requirements.txt → verification/top/requirements.txt b/verification/requirements.txt → verification/top/requirements.txt
@@ -6,8 +6,8 @@ ${RV_ROOT}/third_party/cocotb
 cocotb-bus==0.2.1
 cocotb-coverage==1.1.0
 cocotb-test==0.2.4
-pytest
-pytest-html
-pytest-timeout
-pytest-md
-pyuvm
+pytest==7.4.1
+pytest-html==3.2.0
+pytest-timeout==2.1.0
+pytest-md==0.2.0
+pyuvm==2.9.1
diff --git a/verification/test_pyuvm/Makefile → verification/top/test_pyuvm/Makefile b/verification/test_pyuvm/Makefile → verification/top/test_pyuvm/Makefile
diff --git a/verification/test_pyuvm/__init__.py → verification/top/test_pyuvm/__init__.py b/verification/test_pyuvm/__init__.py → verification/top/test_pyuvm/__init__.py
diff --git a/verification/test_pyuvm/conftest.py → verification/top/test_pyuvm/conftest.py b/verification/test_pyuvm/conftest.py → verification/top/test_pyuvm/conftest.py
diff --git a/...fication/test_pyuvm/test_irq/irq_utils.py → ...tion/top/test_pyuvm/test_irq/irq_utils.py b/...fication/test_pyuvm/test_irq/irq_utils.py → ...tion/top/test_pyuvm/test_irq/irq_utils.py
diff --git a/verification/test_pyuvm/test_irq/irq_uvm.py → ...cation/top/test_pyuvm/test_irq/irq_uvm.py b/verification/test_pyuvm/test_irq/irq_uvm.py → ...cation/top/test_pyuvm/test_irq/irq_uvm.py
diff --git a/verification/test_pyuvm/test_irq/test_irq.py → ...ation/top/test_pyuvm/test_irq/test_irq.py b/verification/test_pyuvm/test_irq/test_irq.py → ...ation/top/test_pyuvm/test_irq/test_irq.py
diff --git a/verification/test_pyuvm/test_pyuvm.py → verification/top/test_pyuvm/test_pyuvm.py b/verification/test_pyuvm/test_pyuvm.py → verification/top/test_pyuvm/test_pyuvm.py