Modify tests to be able of run pytest from project root

Author: rodrigomelo9

Makefile

@@ -11,7 +11,7 @@ lint:
 	git diff --check --cached
 
 test:
-	cd tests; pytest
+	pytest
 
 clean:
 	py3clean .

tests/test_data.py

@@ -2,41 +2,59 @@
 
 from pyfpga.vivado import Vivado
 
+tdir = Path(__file__).parent.resolve()
+
 pattern = {
     'project': 'EXAMPLE',
     'part': 'PARTNAME',
     'includes': [
-        Path('fakedata/dir1').resolve().as_posix(),
-        Path('fakedata/dir2').resolve().as_posix(),
-        Path('fakedata/dir3').resolve().as_posix()
+        Path(tdir / 'fakedata/dir1').resolve().as_posix(),
+        Path(tdir / 'fakedata/dir2').resolve().as_posix(),
+        Path(tdir / 'fakedata/dir3').resolve().as_posix()
     ],
     'files': {
-        Path('fakedata/vhdl0.vhdl').resolve().as_posix(): {
+        Path(tdir / 'fakedata/vhdl0.vhdl').resolve().as_posix(): {
             'hdl': 'vhdl', 'lib': 'LIB'
         },
-        Path('fakedata/dir1/vhdl1.vhdl').resolve().as_posix(): {
+        Path(tdir / 'fakedata/dir1/vhdl1.vhdl').resolve().as_posix(): {
             'hdl': 'vhdl', 'lib': 'LIB'
         },
-        Path('fakedata/dir2/vhdl2.vhdl').resolve().as_posix(): {
+        Path(tdir / 'fakedata/dir2/vhdl2.vhdl').resolve().as_posix(): {
             'hdl': 'vhdl', 'lib': 'LIB'
         },
-        Path('fakedata/dir3/vhdl3.vhdl').resolve().as_posix(): {
+        Path(tdir / 'fakedata/dir3/vhdl3.vhdl').resolve().as_posix(): {
             'hdl': 'vhdl', 'lib': 'LIB'
         },
-        Path('fakedata/vlog0.v').resolve().as_posix(): {'hdl': 'vlog'},
-        Path('fakedata/dir1/vlog1.v').resolve().as_posix(): {'hdl': 'vlog'},
-        Path('fakedata/dir2/vlog2.v').resolve().as_posix(): {'hdl': 'vlog'},
-        Path('fakedata/dir3/vlog3.v').resolve().as_posix(): {'hdl': 'vlog'},
-        Path('fakedata/slog0.sv').resolve().as_posix(): {'hdl': 'slog'},
-        Path('fakedata/dir1/slog1.sv').resolve().as_posix(): {'hdl': 'slog'},
-        Path('fakedata/dir2/slog2.sv').resolve().as_posix(): {'hdl': 'slog'},
-        Path('fakedata/dir3/slog3.sv').resolve().as_posix(): {'hdl': 'slog'}
+        Path(tdir / 'fakedata/vlog0.v').resolve().as_posix(): {
+            'hdl': 'vlog'
+        },
+        Path(tdir / 'fakedata/dir1/vlog1.v').resolve().as_posix(): {
+            'hdl': 'vlog'
+        },
+        Path(tdir / 'fakedata/dir2/vlog2.v').resolve().as_posix(): {
+            'hdl': 'vlog'
+        },
+        Path(tdir / 'fakedata/dir3/vlog3.v').resolve().as_posix(): {
+            'hdl': 'vlog'
+        },
+        Path(tdir / 'fakedata/slog0.sv').resolve().as_posix(): {
+            'hdl': 'slog'
+        },
+        Path(tdir / 'fakedata/dir1/slog1.sv').resolve().as_posix(): {
+            'hdl': 'slog'
+        },
+        Path(tdir / 'fakedata/dir2/slog2.sv').resolve().as_posix(): {
+            'hdl': 'slog'
+        },
+        Path(tdir / 'fakedata/dir3/slog3.sv').resolve().as_posix(): {
+            'hdl': 'slog'
+        }
     },
     'top': 'TOPNAME',
     'constraints': {
-        Path('fakedata/cons/all.xdc').resolve().as_posix(): 'all',
-        Path('fakedata/cons/syn.xdc').resolve().as_posix(): 'syn',
-        Path('fakedata/cons/par.xdc').resolve().as_posix(): 'par'
+        Path(tdir / 'fakedata/cons/all.xdc').resolve().as_posix(): 'all',
+        Path(tdir / 'fakedata/cons/syn.xdc').resolve().as_posix(): 'syn',
+        Path(tdir / 'fakedata/cons/par.xdc').resolve().as_posix(): 'par'
     },
     'params': {
         'PAR1': 'VAL1',
@@ -65,15 +83,15 @@ def test_data():
     prj = Vivado('EXAMPLE')
     prj.set_part('PARTNAME')
     prj.set_top('TOPNAME')
-    prj.add_include('fakedata/dir1')
-    prj.add_include('fakedata/dir2')
-    prj.add_include('fakedata/dir3')
-    prj.add_slog('fakedata/**/*.sv')
-    prj.add_vhdl('fakedata/**/*.vhdl', 'LIB')
-    prj.add_vlog('fakedata/**/*.v')
-    prj.add_cons('fakedata/cons/all.xdc')
-    prj.add_cons('fakedata/cons/syn.xdc', 'syn')
-    prj.add_cons('fakedata/cons/par.xdc', 'par')
+    prj.add_include(str(tdir / 'fakedata/dir1'))
+    prj.add_include(str(tdir / 'fakedata/dir2'))
+    prj.add_include(str(tdir / 'fakedata/dir3'))
+    prj.add_slog(str(tdir / 'fakedata/**/*.sv'))
+    prj.add_vhdl(str(tdir / 'fakedata/**/*.vhdl'), 'LIB')
+    prj.add_vlog(str(tdir / 'fakedata/**/*.v'))
+    prj.add_cons(str(tdir / 'fakedata/cons/all.xdc'))
+    prj.add_cons(str(tdir / 'fakedata/cons/syn.xdc'), 'syn')
+    prj.add_cons(str(tdir / 'fakedata/cons/par.xdc'), 'par')
     prj.add_param('PAR1', 'VAL1')
     prj.add_param('PAR2', 'VAL2')
     prj.add_param('PAR3', 'VAL3')

tests/test_tools.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 from pyfpga.factory import Factory
 
+tdir = Path(__file__).parent.resolve()
+
 
 def test_ise():
     tool = 'ise'
@@ -45,15 +47,15 @@ def generate(tool, part):
     prj = Factory(tool, odir=f'results/{tool}')
     prj.set_part(part)
     prj.set_top('TOPNAME')
-    prj.add_include('fakedata/dir1')
-    prj.add_include('fakedata/dir2')
+    prj.add_include(str(tdir / 'fakedata/dir1'))
+    prj.add_include(str(tdir / 'fakedata/dir2'))
     if tool != 'ise':
-        prj.add_slog('fakedata/**/*.sv')
-    prj.add_vhdl('fakedata/**/*.vhdl', 'LIB')
-    prj.add_vlog('fakedata/**/*.v')
-    prj.add_cons('fakedata/cons/all.xdc')
-    prj.add_cons('fakedata/cons/syn.xdc', 'syn')
-    prj.add_cons('fakedata/cons/par.xdc', 'par')
+        prj.add_slog(str(tdir / 'fakedata/**/*.sv'))
+    prj.add_vhdl(str(tdir / 'fakedata/**/*.vhdl'), 'LIB')
+    prj.add_vlog(str(tdir / 'fakedata/**/*.v'))
+    prj.add_cons(str(tdir / 'fakedata/cons/all.xdc'))
+    prj.add_cons(str(tdir / 'fakedata/cons/syn.xdc'), 'syn')
+    prj.add_cons(str(tdir / 'fakedata/cons/par.xdc'), 'par')
     prj.add_param('PAR1', 'VAL1')
     prj.add_param('PAR2', 'VAL2')
     prj.add_define('DEF1', 'VAL1')