pytest module and their definitions are renamed.

Author: shtaxxx

tests/Makefile

@@ -1,8 +1,18 @@
-.PHONY: clean
-clean:
-	rm -rf *.pyc __pycache__ parsetab.py *.out tmp.v uut.vcd
-	find . -maxdepth 1 -type d |grep "./" | xargs -I {} make clean -C {} 
+PYTHON=python3
+#PYTHON=python
+
+.PHONY: all
+all: clean
 
 .PHONY: test
 test:
-	find . -maxdepth 1 -type d |grep "./" | xargs -I {} make test -C {} 
+	$(PYTHON) -m pytest -vv
+
+.PHONY: run
+run:
+	find . -maxdepth 1 -type d |grep "./" | xargs -I {} make run -C {}
+
+.PHONY: clean
+clean:
+	rm -rf *.pyc __pycache__ parsetab.py *.out .cache
+	find . -maxdepth 1 -type d |grep "./" | xargs -I {} make clean -C {}

tests/case/Makefile

@@ -1,5 +1,4 @@
-TARGET=led.py
-TEST=test_led.py
+TARGET=*.py
 ARGS=
 
 PYTHON=python3
@@ -17,7 +16,7 @@ run:
 
 .PHONY: test
 test:
-	$(PYTHON) -m pytest -vv $(TEST)
+	$(PYTHON) -m pytest -vv
 
 .PHONY: check
 check:
@@ -27,4 +26,4 @@ check:
 
 .PHONY: clean
 clean:
-	rm -rf *.pyc __pycache__ parsetab.py *.out
+	rm -rf *.pyc __pycache__ parsetab.py *.out tmp.v uut.vcd

tests/case/led.py renamed to tests/case/case.py

@@ -1,6 +1,9 @@
 import sys
 import os
 
+# the next line can be removed after installation
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
+
 from veriloggen import *
 
 def mkLed():

tests/case/test_led.py renamed to tests/case/test_case.py

@@ -1,4 +1,4 @@
-import led
+import case
 
 expected_verilog = """
 module blinkled #
@@ -29,9 +29,9 @@
 endmodule
 """
 
-def test_led():
-    led_module = led.mkLed()
-    led_code = led_module.to_verilog()
+def test():
+    test_module = case.mkLed()
+    code = test_module.to_verilog()
 
     from pyverilog.vparser.parser import VerilogParser
     from pyverilog.ast_code_generator.codegen import ASTCodeGenerator
@@ -40,4 +40,4 @@ def test_led():
     codegen = ASTCodeGenerator()
     expected_code = codegen.visit(expected_ast)
 
-    assert(expected_code == led_code)
+    assert(expected_code == code)

tests/case/veriloggen

@@ -1,5 +1,4 @@
-TARGET=led.py
-TEST=test_led.py
+TARGET=*.py
 ARGS=
 
 PYTHON=python3
@@ -17,7 +16,7 @@ run:
 
 .PHONY: test
 test:
-	$(PYTHON) -m pytest -vv $(TEST)
+	$(PYTHON) -m pytest -vv
 
 .PHONY: check
 check:
@@ -27,4 +26,4 @@ check:
 
 .PHONY: clean
 clean:
-	rm -rf *.pyc __pycache__ parsetab.py *.out
+	rm -rf *.pyc __pycache__ parsetab.py *.out tmp.v uut.vcd

tests/cat/Makefile

@@ -1,5 +1,4 @@
-TARGET=led.py
-TEST=test_led.py
+TARGET=*.py
 ARGS=
 
 PYTHON=python3
@@ -17,7 +16,7 @@ run:
 
 .PHONY: test
 test:
-	$(PYTHON) -m pytest -vv $(TEST)
+	$(PYTHON) -m pytest -vv
 
 .PHONY: check
 check:
@@ -27,4 +26,4 @@ check:
 
 .PHONY: clean
 clean:
-	rm -rf *.pyc __pycache__ parsetab.py *.out
+	rm -rf *.pyc __pycache__ parsetab.py *.out tmp.v uut.vcd