Skip to content

Commit

Permalink
Merge pull request #72 from gsmecher/fix-python-template
Browse files Browse the repository at this point in the history
riscof_model.py fixes: don't use __init__ return value; use make -k. Fixes #71, #73.
  • Loading branch information
pawks committed Jan 30, 2023
2 parents 4f8b28a + 2500099 commit e1282f0
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.25.3] - 2023-01-24
- use "make -k" in riscof_model.py template to ensure all test cases run, even after a failure. Fixes #73.

## [1.25.2] - 2022-10-08
- updating paths for docker image and plugins to point to new location

Expand Down
7 changes: 2 additions & 5 deletions riscof/Templates/setup/model/riscof_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class dutname(pluginTemplate):
__version__ = "XXX"

def __init__(self, *args, **kwargs):
sclass = super().__init__(*args, **kwargs)
super().__init__(*args, **kwargs)

config = kwargs.get('config')

Expand Down Expand Up @@ -59,9 +59,6 @@ def __init__(self, *args, **kwargs):
else:
self.target_run = True

# Return the parameters set above back to RISCOF for further processing.
return sclass

def initialise(self, suite, work_dir, archtest_env):

# capture the working directory. Any artifacts that the DUT creates should be placed in this
Expand Down Expand Up @@ -120,7 +117,7 @@ def runTests(self, testList):

# set the make command that will be used. The num_jobs parameter was set in the __init__
# function earlier
make.makeCommand = 'make -j' + self.num_jobs
make.makeCommand = 'make -k -j' + self.num_jobs

# we will iterate over each entry in the testList. Each entry node will be refered to by the
# variable testname.
Expand Down
2 changes: 1 addition & 1 deletion riscof/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

__author__ = """InCore Semiconductors Pvt Ltd"""
__email__ = 'info@incoresemi.com'
__version__ = '1.25.2'
__version__ = '1.25.3'
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.25.2
current_version = 1.25.3
commit = True
tag = True

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def read_requires():
test_requirements = [ ]

setup(name="riscof",
version='1.25.2',
version='1.25.3',
description="RISC-V Architectural Test Framework",
long_description=readme + '\n\n',
classifiers=[
Expand Down

0 comments on commit e1282f0

Please sign in to comment.