Add requirements.txt and reorder imports by type.

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index 71575b2c61776d1aa01f3178284d133635060530..de8241ce33fb6c503308971090b8929f5369b8f2 100755 (executable)
--- 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 (file)
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 99c4a7628b0188568d98a0be9898dd4c5dc3d0e0..c186a175a5cc9d50a8c26d7c49618fa474dd6e2f 100644 (file)
--- 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