Use "board" directory instead of ugly custom->suite_Factory symlink.
BUG=None
CQ-DEPEND=CL:40138,CL:*30449
TEST=buildbot
Change-Id: I8645cbc9b80aca1215544bc6cec033612cddd5d3
Reviewed-on: https://gerrit.chromium.org/gerrit/40138
Reviewed-by: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Jon Salz <jsalz@chromium.org>
Commit-Queue: Jon Salz <jsalz@chromium.org>
diff --git a/py/goofy/goofy.py b/py/goofy/goofy.py
index c5fc57b..9876737 100755
--- a/py/goofy/goofy.py
+++ b/py/goofy/goofy.py
@@ -96,7 +96,14 @@
'''
hwid_cfg = get_hwid_cfg()
- search_dirs = [CUSTOM_DIR, DEFAULT_TEST_LISTS_DIR]
+ search_dirs = [DEFAULT_TEST_LISTS_DIR]
+ if not utils.in_chroot():
+ # Also look in suite_Factory. For backward compatibility only;
+ # new boards should just put the test list in the "test_lists"
+ # directory.
+ search_dirs.insert(0, os.path.join(
+ os.path.dirname(factory.FACTORY_PATH),
+ 'autotest', 'site_tests', 'suite_Factory'))
# Try in order: test_list_${hwid_cfg}, test_list, test_list.all
search_files = ['test_list', 'test_list.all']