diff options
author | Tim Newsome <tim@sifive.com> | 2017-06-26 10:00:34 -0700 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2017-06-26 10:06:10 -0700 |
commit | 272e12eb177c662826f901d536f685a4abf62123 (patch) | |
tree | 1a92b0969a5ed9ac60d62926d7c94222bdde069a /debug/testlib.py | |
parent | 806deb8e53e029df31defc88d09c6c2c2b08e8f3 (diff) | |
download | riscv-tests-272e12eb177c662826f901d536f685a4abf62123.zip riscv-tests-272e12eb177c662826f901d536f685a4abf62123.tar.gz riscv-tests-272e12eb177c662826f901d536f685a4abf62123.tar.bz2 |
Move target definition into individual files.
Instead of defining each target in targets.py, now each target gets its
own .py file. This means people can easily keep their own target files
around that they may not want to put into the main test source. As part
of that, I removed the freedom-u500-sim target since I assume it's only
used internally at SiFive.
Added a few cleanups as well:
* Update README examples, mostly --sim_cmd instead of --cmd.
* Allow defining misa in a target, to skip running of ExamineTarget.
* Rename target.target() to target.create(), which is less confusing.
* Default --sim_cmd to `spike`
* Got rid of `use_fpu`, instead looking at F or D in $misa.
Diffstat (limited to 'debug/testlib.py')
-rw-r--r-- | debug/testlib.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/debug/testlib.py b/debug/testlib.py index b59e6e8..f511088 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -261,7 +261,7 @@ class Openocd(object): try: self.process.kill() self.process.wait() - except OSError: + except (OSError, AttributeError): pass class OpenocdCli(object): @@ -416,8 +416,9 @@ def run_all_tests(module, target, parsed): todo = [] if parsed.misaval: target.misa = int(parsed.misaval, 16) - print "Assuming $MISA value of 0x%x. Skipping ExamineTarget." % \ - target.misa + print "Using $misa from command line: 0x%x" % target.misa + elif target.misa: + print "Using $misa from target definition: 0x%x" % target.misa else: todo.append(("ExamineTarget", ExamineTarget)) @@ -538,7 +539,7 @@ class BaseTest(object): def classSetup(self): self.compile() - self.target_process = self.target.target() + self.target_process = self.target.create() self.server = self.target.server() self.logs.append(self.server.logname) |