Remove "import ." notation.

[riscv-tests.git] / debug / testlib.py

diff --git a/debug/testlib.py b/debug/testlib.py
index d6044f5eba79adeecdf507d2f43e826155b37feb..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
@@ -103,7 +103,6 @@ class VcsSim(object):
                 done = True
             
     def __del__(self):
-        print "DELETE called for VcsSim"
         try:
             self.process.kill()
             self.process.wait()
@@ -112,12 +111,12 @@ class VcsSim(object):
 
         
 class Openocd(object):
-    def __init__(self, cmd=None, config=None, debug=False, keepAlive=None):
+    def __init__(self, cmd=None, config=None, debug=False, otherProcess=None):
 
         # keep handles to other processes -- don't let them be
         # garbage collected yet.
 
-        self.keepAlive = keepAlive
+        self.otherProcess = otherProcess
         if cmd:
             cmd = shlex.split(cmd)
         else: