Fix relative class path arg handling in runtest, and some lint errors.
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 34f979f..593d11d 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -23,7 +23,6 @@
import glob
import optparse
import os
-import re
from sets import Set
import sys
@@ -61,6 +60,10 @@
# disable logging of timestamp
self._root_path = android_build.GetTop()
logger.SetTimestampLogging(False)
+ self._adb = None
+ self._known_tests = None
+ self._options = None
+ self._test_args = None
def _ProcessOptions(self):
"""Processes command-line options."""
@@ -264,8 +267,8 @@
except KeyboardInterrupt:
logger.Log("Exiting...")
- except errors.AbortError, e:
- logger.Log(e.msg)
+ except errors.AbortError, error:
+ logger.Log(error.msg)
logger.SilentLog("Exiting due to AbortError...")
except errors.WaitForResponseTimedOutError:
logger.Log("Timed out waiting for response")