From 03c18639caa0c26bb58e81d20cc05175011b313e Mon Sep 17 00:00:00 2001 From: Richard Xia Date: Mon, 22 Aug 2016 18:16:53 -0700 Subject: [PATCH] Add requirements.txt and reorder imports by type. --- debug/gdbserver.py | 3 ++- debug/requirements.txt | 1 + debug/testlib.py | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 debug/requirements.txt 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..f1ef790 --- /dev/null +++ b/debug/requirements.txt @@ -0,0 +1 @@ +pexpect==4.2.1 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 -- 2.30.2