pick up the android_ actions from the lava-android-test actions

1 files changed, 9 insertions, 2 deletions

diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py
index 17acab3..274c0fc 100755
--- a/build-scripts/post-build-lava.py
+++ b/build-scripts/post-build-lava.py
@@ -101,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))
 
@@ -114,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