Update generate_test_report to work from within HWQual tarball.
BUG=none
TEST=Verify generate_test_report works from src/scripts now.
Change-Id: Ic4933663ef64bf1b66cce8b79721d432700a2799
Reviewed-on: https://gerrit.chromium.org/gerrit/43895
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
diff --git a/utils_py/generate_test_report.py b/utils_py/generate_test_report.py
index bd53756..29159c9 100755
--- a/utils_py/generate_test_report.py
+++ b/utils_py/generate_test_report.py
@@ -21,9 +21,14 @@
try:
from chromite.lib import cros_build_lib
except ImportError:
+ # N.B., this script needs to work outside the chroot, from both
+ # 'src/scripts' and from 'crostestutils/utils_py'.
script_path = os.path.dirname(os.path.abspath(__file__))
- cros_path = os.path.join(script_path, "../../../..")
- sys.path.append(cros_path)
+ cros_path = os.path.join(script_path, '../../../..')
+ for lib_path in (script_path, cros_path):
+ chromite_path = os.path.join(lib_path, 'chromite')
+ if os.path.isdir(chromite_path):
+ sys.path.append(lib_path)
from chromite.lib import cros_build_lib
from chromite.lib import terminal