[Fuego] [PATCH 1/3] dynvars: add support for simple variable assignments

[Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>]

Before dynamic-vars require a python dictionary style notation
to define dynamic variables. This was an overkill for simple
variable assignments, as Tim noted. For that reason, this patch
introduces support for simple variable assignments in the
form of "VAR1=VALUE1,VAR2=VALUE2". Internally, these are parsed
and converted into a python dictionary.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/scripts/ftc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index 4ab4ef2..23f09ca 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -243,7 +243,7 @@ You can obtain a list of run_ids for runs on the local system with
     """Usage: ftc run-test -b <board> -t <test> [-s <spec>] [-p <phases>]
     [-k <kill timeout>] [--rebuild <true|false>] [--reboot <true|false>]
     [--precleanup <true|false>] [--postcleanup <true|false>]
-    [--dynamic-vars python_dict]
+    [--dynamic-vars variable assignments or python_dict]
 Run the indicated test on the specified board.  Use the
 indicated spec, if one is provided.
 
@@ -254,6 +254,7 @@ reboot: if true reboot the board before the test.
 precleanup: if true clean the board's test folder before the test.
 postcleanup: if true clean the board's test folder after the test.
 dynamic-vars: allows overriding the variables in a spec from the command line.
+  Example: ftc run-test -b bbb -t Functional.bc -s bc-add --dynamic-vars "EXPR=3+4,RESULT=7"
   Example: ftc run-test -b bbb -t Benchmark.Dhrystone --dynamic-vars "{'LOOPS':'400000000'}"
 
 A list of phase characters may be provided, to execute only those phases
@@ -3366,9 +3367,16 @@ def do_run_test(conf, options):
 
     if '--dynamic-vars' in options:
         try:
-            import ast
             dyn_vars_str = options[options.index('--dynamic-vars') + 1]
-            dyn_vars = ast.literal_eval(dyn_vars_str)
+            if dyn_vars_str[0] == '{':
+                import ast
+                dyn_vars = ast.literal_eval(dyn_vars_str)
+            else:
+                dyn_vars = dict()
+                for var_definition in dyn_vars_str.split(','):
+                    key = var_definition.split('=')[0]
+                    value = var_definition.split('=')[1]
+                    dyn_vars[key] = value
         except IndexError:
             error_out('Dynamic vars not provided after --dynamic-vars.')
         options.remove(dyn_vars_str)
-- 
2.7.4