[merge] add support for passing option to lava from android-build

1 files changed, 11 insertions, 4 deletions

diff --git a/build-scripts/post-build-lava.py b/build-scripts/post-build-lava.py
index efe61ff..443df11 100755
--- a/build-scripts/post-build-lava.py
+++ b/build-scripts/post-build-lava.py
@@ -5,6 +5,7 @@ import re
 import json
 import xmlrpclib
 
+
 def obfuscate_credentials(s):
     return re.sub(r"([^ ]:).+?(@)", r"\1xxx\2", s)
 
@@ -47,6 +48,8 @@ PRODUCT_MAP = {
             "vexpress")},
 }
 
+OPTION_SUFFIX = "_OPTION"
+
 
 def gen_lava_android_test_actions(tests=[]):
     actions = []
@@ -62,12 +65,16 @@ def gen_lava_android_test_actions(tests=[]):
     actions.append(inst_action)
 
     for test in tests:
+        parameters = {'test_name': test}
+
+        test_option = os.environ.get('%s%s' % (test.upper(), OPTION_SUFFIX))
+        if test_option:
+            parameters['option'] = test_option
+
         run_action = {
                       "command": "lava_android_test_run",
-                      "parameters": {
-                                     "test_name": test
-                                         }
-                        }
+                      "parameters": parameters
+                    }
         actions.append(run_action)
     return actions