Add a flasher module to the project. (#213)

JSRemoteTest-DCO-1.0-Signed-off-by: Roland Takacs [email protected]

Author: rtakacs

jstest/__init__.py

@@ -15,6 +15,7 @@
 from jstest.builder.builder import Builder
 from jstest.common import console, paths, symbol_resolver, utils
 from jstest.emulate import pseudo_terminal
+from jstest.flasher import flasher
 from jstest.testresult import TestResult
 from jstest.testrunner.testrunner import TestRunner
 

jstest/__main__.py

@@ -20,7 +20,7 @@
 
 import jstest
 from jstest import Builder, TestResult, TestRunner
-from jstest import paths, pseudo_terminal, utils
+from jstest import flasher, paths, pseudo_terminal, utils
 
 
 def parse_options():
@@ -184,6 +184,8 @@ def main():
             builder = Builder(env)
             builder.build()
 
+            flasher.flash(env)
+
             testrunner = TestRunner(env)
             testrunner.run()
             testrunner.save()

jstest/builder/builder.py

@@ -23,7 +23,7 @@ def init_modules(modules):
     '''
     for build_info in modules.values():
         for command in build_info.get('init', []):
-            exec_cmd(command)
+            utils.execute_config_command(command)
 
 
 def build_modules(modules):
@@ -33,10 +33,10 @@ def build_modules(modules):
     # FIXME: remove the sorted function that helps to
     # build iotjs and jerryscript before NuttX.
     for _, build_info in sorted(modules.iteritems()):
-        exec_cmd(build_info.get('build'))
+        utils.execute_config_command(build_info.get('build'))
 
 
-def save_artifacts(modules, builddir):
+def save_artifacts(modules):
     '''
     Copy the created files (libs, linker.map, ...) into the build folder.
     '''
@@ -49,32 +49,7 @@ def save_artifacts(modules, builddir):
             src = artifact.get('src')
             dst = artifact.get('dst')
 
-            utils.copy(src, utils.join(builddir, dst))
-
-
-def exec_cmd(command):
-    '''
-    Run the command defined in the build.config file.
-    '''
-    cwd = command.get('cwd', '.')
-    cmd = command.get('cmd', '')
-    args = command.get('args', [])
-    env = command.get('env', {})
-
-    # Update the arguments and the env variables with
-    # the values under the condition-options.
-    for option in command.get('conditional-options', []):
-        if not eval(option.get('condition')):
-            continue
-
-        args.extend(option.get('args', []))
-        env = utils.merge_dicts(env, option.get('env', {}))
-
-    # Convert array values to string to be real env values.
-    for key, value in env.iteritems():
-        env[key] = ' '.join(value)
-
-    utils.execute(cwd, cmd, args=args, env=env)
+            utils.copy(src, dst)
 
 
 class Builder(object):
@@ -84,7 +59,6 @@ class Builder(object):
     def __init__(self, env):
         self.env = env
         self.device = env.options.device
-        self.build_dir = env.paths.builddir
 
         # Do not initialize the modules if the build is disabled.
         if env.options.no_build:
@@ -106,7 +80,7 @@ def build(self):
 
         init_modules(modules)
         build_modules(modules)
-        save_artifacts(modules, self.build_dir)
+        save_artifacts(modules)
 
         # Create build information.
         builder_utils.create_build_info(self.env)
@@ -136,7 +110,7 @@ def should_build(self, build_info):
 
             # If dst is provided, check that first. If it doesn't, it's
             # enough just check the src.
-            if dst and not utils.exists(utils.join(self.build_dir, dst)):
+            if dst and not utils.exists(dst):
                 return True
 
             if not dst and not utils.exists(src):

jstest/common/builtins.py

@@ -72,11 +72,35 @@ def print_message(**params):
     console.log(params['args'][0])
 
 
+def init_freya_config(**params):
+    '''
+    Resolve the %{iotjs-dirname} symbol in the Freya configuration file.
+    '''
+    iotjs_src = params['args'][0]
+    build_dir = params['args'][1]
+
+    pattern = 's/%%{iotjs-dirname}/%s/g' % utils.basename(iotjs_src)
+
+    utils.execute(build_dir, 'sed', ['-i', pattern, 'iotjs-freya.config'])
+
+
+def mount_fs_writable(**params):
+    '''
+    Remount the file system as writable.
+    '''
+    addr = params['args'][0]
+    port = params['args'][1]
+
+    utils.execute('.', 'ssh', [addr, '-p %s' % port, 'mount -o remount,rw /'])
+
+
 NATIVES = {
   'print': print_message,
   'genromfs': genromfs,
   'config_internet': config_internet,
-  'push_environment': push_environment
+  'push_environment': push_environment,
+  'init_freya_config': init_freya_config,
+  'mount_fs_writable': mount_fs_writable
 }
 
 

jstest/common/paths.py

@@ -41,6 +41,8 @@
 
 BUILDER_MODULES_PATH = os.path.join(JSTEST_PATH, 'builder', 'modules')
 
+FLASH_CONFIG_FILE = os.path.join(JSTEST_PATH, 'flasher', 'flash.config')
+
 #
 # ================================
 #

jstest/common/symbol_resolver.py

@@ -97,9 +97,12 @@ def resolve_symbol(symbol, env):
         'device': env.options.device,
         'appname': env.options.app,
         'ip-addr': env.options.ip,
+        'port': env.options.port,
+        'user': env.options.username,
         'gateway': env.options.router,
         'netmask': env.options.netmask,
         'build-type': env.options.buildtype,
+        'remote-workdir': env.options.remote_workdir,
         'use-stack': 'no-stack' if env.options.no_memstat else 'stack',
         'communication': 'telnet' if env.options.ip else 'serial',
         'target': _TARGETS[env.options.device],

jstest/common/utils.py

@@ -95,6 +95,36 @@ def execute(cwd, cmd, args=None, env=None, quiet=False, strict=True):
     return exec_shell(cwd, cmd, args, env, quiet, strict)
 
 
+def execute_config_command(command):
+    '''
+    Run the command defined in the build.config file.
+    '''
+    condition = command.get('condition', 'True')
+
+    if not eval(condition):
+        return
+
+    cwd = command.get('cwd', '.')
+    cmd = command.get('cmd', '')
+    args = command.get('args', [])
+    env = command.get('env', {})
+
+    # Update the arguments and the env variables with
+    # the values under the condition-options.
+    for option in command.get('conditional-options', []):
+        if not eval(option.get('condition')):
+            continue
+
+        args.extend(option.get('args', []))
+        env = merge_dicts(env, option.get('env', {}))
+
+    # Convert array values to string to be real env values.
+    for key, value in env.iteritems():
+        env[key] = ' '.join(value)
+
+    execute(cwd, cmd, args=args, env=env)
+
+
 def print_command(cwd, cmd, args):
     '''
     Helper function to print commands.

jstest/flasher/__init__.py

@@ -0,0 +1 @@
+# Required for Python to search this directory for module files.

jstest/flasher/flash.config

@@ -0,0 +1,60 @@
+{
+  "stm32f4dis": {
+    "flash": {
+      "cwd": "%{stlink}",
+      "cmd": "build/Release/st-flash",
+      "args": ["write", "%{build-dir}/nuttx.bin", "0x8000000"]
+    }
+  },
+  "artik053": {
+    "flash": {
+      "cwd": "%{tizenrt}/os",
+      "cmd": "make",
+      "args": ["download", "ALL"]
+    }
+  },
+  "artik530": {
+    "init": [
+      {
+        "condition": "('%{appname}' == 'iotjs') and %{memstat}",
+        "cmd": "function(init_freya_config)",
+        "args": ["%{gbs-iotjs}", "%{build-dir}"]
+      },
+      {
+        "cmd": "function(mount_fs_writable)",
+        "args": ["%{user}@%{ip-addr}", "%{port}"]
+      }
+    ],
+    "flash": {
+      "cmd": "rsync",
+      "args": [
+        "--rsh", "ssh -p %{port}",
+        "--recursive",
+        "--compress",
+        "--delete",
+        "%{build-dir}/",
+        "%{user}@%{ip-addr}:%{remote-workdir}"
+      ]
+    }
+  },
+  "rpi2": {
+    "init": [
+      {
+        "condition": "('%{appname}' == 'iotjs') and %{memstat}",
+        "cmd": "function(init_freya_config)",
+        "args": ["%{iotjs}", "%{build-dir}"]
+      }
+    ],
+    "flash": {
+      "cmd": "rsync",
+      "args": [
+        "--rsh", "ssh -p %{port}",
+        "--recursive",
+        "--compress",
+        "--delete",
+        "%{build-dir}/",
+        "%{user}@%{ip-addr}:%{remote-workdir}"
+      ]
+    }
+  }
+}

jstest/flasher/flasher.py

@@ -0,0 +1,33 @@
+# Copyright 2018-present Samsung Electronics Co., Ltd. and other contributors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from jstest.common import utils, paths
+
+
+def flash(env):
+    '''
+    Flash the device.
+    '''
+    if env.options.no_flash:
+        return
+
+    config = utils.read_config_file(paths.FLASH_CONFIG_FILE, env)
+    # Get the device specific flash instructions.
+    flash_info = config[env.options.device]
+
+    # Do the initialization steps.
+    for command in flash_info.get('init', []):
+        utils.execute_config_command(command)
+    # Flash the device.
+    utils.execute_config_command(flash_info.get('flash'))