functional tests: run from make tests but not smtlib/rkt tests

This commit is contained in:
Emily Schmidt 2024-09-04 10:30:08 +01:00
parent 7de8be1451
commit 5a476a8d29
4 changed files with 9 additions and 2 deletions

View File

@ -891,6 +891,7 @@ endif
+cd tests/xprop && bash run-test.sh $(SEEDOPT) +cd tests/xprop && bash run-test.sh $(SEEDOPT)
+cd tests/fmt && bash run-test.sh +cd tests/fmt && bash run-test.sh
+cd tests/cxxrtl && bash run-test.sh +cd tests/cxxrtl && bash run-test.sh
+cd tests/functional && bash run-test.sh
@echo "" @echo ""
@echo " Passed \"make test\"." @echo " Passed \"make test\"."
@echo "" @echo ""

View File

@ -4,6 +4,10 @@ import random
random_seed = random.getrandbits(32) random_seed = random.getrandbits(32)
def pytest_configure(config):
config.addinivalue_line("markers", "smt: test uses smtlib/z3")
config.addinivalue_line("markers", "rkt: test uses racket/rosette")
def pytest_addoption(parser): def pytest_addoption(parser):
parser.addoption("--per-cell", type=int, default=None, help="run only N tests per cell") parser.addoption("--per-cell", type=int, default=None, help="run only N tests per cell")
parser.addoption("--steps", type=int, default=1000, help="run each test for N steps") parser.addoption("--steps", type=int, default=1000, help="run each test for N steps")

View File

@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
pytest -v "$@" pytest -v -m "not smt and not rkt" "$@"

View File

@ -55,6 +55,7 @@ def test_cxx(cell, parameters, tmp_path, num_steps, rnd):
run([str(vcdharness_exe_file.resolve()), str(vcd_functional_file), str(num_steps), str(seed)]) run([str(vcdharness_exe_file.resolve()), str(vcd_functional_file), str(num_steps), str(seed)])
yosys_sim(rtlil_file, vcd_functional_file, vcd_yosys_sim_file, getattr(cell, 'sim_preprocessing', '')) yosys_sim(rtlil_file, vcd_functional_file, vcd_yosys_sim_file, getattr(cell, 'sim_preprocessing', ''))
@pytest.mark.smt
def test_smt(cell, parameters, tmp_path, num_steps, rnd): def test_smt(cell, parameters, tmp_path, num_steps, rnd):
import smt_vcd import smt_vcd
@ -72,6 +73,7 @@ def test_smt(cell, parameters, tmp_path, num_steps, rnd):
smt_vcd.simulate_smt(smt_file, vcd_functional_file, num_steps, rnd(cell.name + "-smt")) smt_vcd.simulate_smt(smt_file, vcd_functional_file, num_steps, rnd(cell.name + "-smt"))
yosys_sim(rtlil_file, vcd_functional_file, vcd_yosys_sim_file, getattr(cell, 'sim_preprocessing', '')) yosys_sim(rtlil_file, vcd_functional_file, vcd_yosys_sim_file, getattr(cell, 'sim_preprocessing', ''))
@pytest.mark.rkt
def test_rkt(cell, parameters, tmp_path, num_steps, rnd): def test_rkt(cell, parameters, tmp_path, num_steps, rnd):
import rkt_vcd import rkt_vcd