Move setting PYTHONPATH from noxfile.py to common.mk

Internal-tag: [#51803] Signed-off-by: Maciej Kurc <mkurc@antmicro.com>
chipsalliance · Jan 10, 2024 · 956d1b1 · 956d1b1
1 parent f4bf4db
commit 956d1b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/verification/block/common.mk b/verification/block/common.mk
@@ -10,6 +10,9 @@ CURDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 CFGDIR := $(abspath $(CURDIR)/snapshots/default)
 CONFIG := $(abspath $(CURDIR)/../../configs)
 
+# Set pythonpath so that tests can access common modules
+export PYTHONPATH := $(CURDIR)/common
+
 # Common sources
 COMMON_SOURCES  = $(CFGDIR)/common_defines.vh
 COMMON_SOURCES += $(CFGDIR)/el2_pdef.vh

diff --git a/verification/block/noxfile.py b/verification/block/noxfile.py
@@ -89,7 +89,6 @@ def isSimFailure(
 
 def verify_block(session, blockName, testName, coverage=""):
     session.install("-r", pipRequirementsPath)
-    session.env["PYTHONPATH"] = os.path.abspath(os.path.join(os.path.dirname(__file__), "common"))
     testPath = os.path.join(blockPath, blockName)
     testNameXML = os.path.join(testName + ".xml")
     testNameXMLPath = os.path.join(testPath, testNameXML)