diff options
| -rw-r--r-- | build-scripts/helpers | 6 | ||||
| -rwxr-xr-x | build-scripts/post-build-lava.py | 16 |
2 files changed, 17 insertions, 5 deletions
diff --git a/build-scripts/helpers b/build-scripts/helpers index fa3083e..7387505 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -23,8 +23,7 @@ setup-repo-vars () { repo-sync-from-mirror () { setup-repo-vars - - repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR + repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR -g all,-notdefault,-eclipse # Save input manifest as build artifact for reference mkdir -p out cp .repo/manifest.xml out/source-manifest.xml @@ -56,7 +55,8 @@ repo-sync-from-seed () { # rmdir ${seed_name}_ # fi - repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" $REPO_MIRROR --reference=$PWD/$seed_name + repo init $REPO_QUIET -u "${MANIFEST_REPO}" -b "${MANIFEST_BRANCH}" -m "${MANIFEST_FILENAME}" \ + $REPO_MIRROR --reference=$PWD/$seed_name -g all,-notdefault,-eclipse mkdir -p out cp .repo/manifest.xml out/source-manifest.xml diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py index 50715cd..274c0fc 100755 --- a/build-scripts/post-build-lava.py +++ b/build-scripts/post-build-lava.py @@ -66,6 +66,11 @@ def gen_lava_android_test_actions(tests=[]): return actions test_actions = [] for test in tests: + #support the special action for android test, + #like android_install_cts_medias + if test.startswith("android_"): + continue + if test == REBOOT_TOKEN: continue ## support for test that specified with option like methanol,methanol(DEFAULT) @@ -96,8 +101,8 @@ def gen_lava_android_test_actions(tests=[]): test_option = test[test.find('(') + 1 : test.rfind(')')] test = test[:test.find('(')].strip() - parameters = {'test_name': test} + parameters = {} if not test_option: test_option = os.environ.get('%s%s' % (test.upper(), OPTION_SUFFIX)) @@ -109,7 +114,14 @@ def gen_lava_android_test_actions(tests=[]): if timeout_option: parameters['timeout'] = int(timeout_option) - if test != REBOOT_TOKEN: + if test.startswith('android_'): + run_action = { + "command": test, + "parameters": parameters + } + actions.append(run_action) + elif test != REBOOT_TOKEN: + parameters['test_name'] = test run_action = { "command": "lava_android_test_run", "parameters": parameters |