diff options
| author | Tim Newsome <tim@sifive.com> | 2016-08-23 14:34:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 14:34:59 -0700 |
| commit | 5ad886f909376920d345c7cf1f7b70c7ef37392f (patch) | |
| tree | b118036bc887a3ad65cc6366a2200ce7149a133b | |
| parent | 6a2e45157df2e4c20540be04e42f9ff13a5ce7f8 (diff) | |
| parent | de9053b96294acbcf2c2de46634720881f09f3a3 (diff) | |
| download | riscv-tests-5ad886f909376920d345c7cf1f7b70c7ef37392f.zip riscv-tests-5ad886f909376920d345c7cf1f7b70c7ef37392f.tar.gz riscv-tests-5ad886f909376920d345c7cf1f7b70c7ef37392f.tar.bz2 | |
Merge pull request #24 from richardxia/declare-dependencies
Add requirements.txt and reorder imports by type.
| -rwxr-xr-x | debug/gdbserver.py | 3 | ||||
| -rw-r--r-- | debug/requirements.txt | 1 | ||||
| -rw-r--r-- | debug/testlib.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/debug/gdbserver.py b/debug/gdbserver.py index 71575b2..de8241c 100755 --- a/debug/gdbserver.py +++ b/debug/gdbserver.py @@ -3,13 +3,14 @@ import os import sys import argparse -import testlib import unittest import tempfile import time import random import binascii +import .testlib + MSTATUS_UIE = 0x00000001 MSTATUS_SIE = 0x00000002 diff --git a/debug/requirements.txt b/debug/requirements.txt new file mode 100644 index 0000000..8fbeb99 --- /dev/null +++ b/debug/requirements.txt @@ -0,0 +1 @@ +pexpect>=4.0.0 diff --git a/debug/testlib.py b/debug/testlib.py index 99c4a76..c186a17 100644 --- a/debug/testlib.py +++ b/debug/testlib.py @@ -1,17 +1,17 @@ import os.path -import pexpect import shlex import subprocess import tempfile -import testlib import unittest import time +import pexpect + # Note that gdb comes with its own testsuite. I was unable to figure out how to # run that testsuite against the spike simulator. def find_file(path): - for directory in (os.getcwd(), os.path.dirname(testlib.__file__)): + for directory in (os.getcwd(), os.path.dirname(__file__)): fullpath = os.path.join(directory, path) if os.path.exists(fullpath): return fullpath |