Add debugger option (#239)

JSRemoteTest-DCO-1.0-Signed-off-by: Robert Sipka [email protected]

Author: robertsipka

jstest/__main__.py

@@ -59,6 +59,9 @@ def parse_options():
                         action='store_true', default=False,
                         help='do not test the application (default: %(default)s)')
 
+    parser.add_argument('--debugger', nargs='?', const='no_address', metavar='ADDRESS',
+                        help='Enable jerry debugger (Set ADDRESS to run debugger at startup')
+
     parser.add_argument('--device',
                         choices=['stm32f4dis', 'rpi2', 'artik053', 'artik530'],
                         default='stm32f4dis',
@@ -149,6 +152,15 @@ def adjust_options(options):
         options.no_flash = True
         options.no_test = True
 
+    # TODO: resolve this section, debugger should work on every target.
+    if options.debugger:
+        if options.device == 'stm32f4dis':
+            jstest.console.warning('Debugger is not supported on STM32F4-Discovery')
+            options.debugger = None
+        elif options.device == 'artik053' and options.app == 'jerryscript':
+            jstest.console.warning('Debugger is not supported on ARTIK053 with JerryScript')
+            options.debugger = None
+
     if options.emulate:
         options.no_flash = True
 

jstest/builder/modules/iotjs.build.config

@@ -29,17 +29,17 @@
       ],
       "conditional-options": [
         {
-          "condition": "%{coverage}",
+          "condition": "%{memstat}",
+          "args": ["--jerry-memstat"]
+        },
+        {
+          "condition": "%{debugger}",
           "args": [
-            "--buildtype=debug",
             "--jerry-debugger",
+            "--jerry-cmake-param=-DJERRY_PORT_DEFAULT=ON",
             "--no-snapshot"
           ]
         },
-        {
-          "condition": "%{memstat}",
-          "args": ["--jerry-memstat"]
-        },
         {
           "condition": "%{minimal-profile-build}",
           "args": ["--profile=profiles/minimal.profile"]
@@ -108,6 +108,15 @@
             ]
           }
         },
+        {
+          "condition": "%{debugger}",
+          "env": {
+           "IOTJS_BUILD_OPTION": [
+              "--jerry-debugger",
+              "--no-snapshot"
+            ]
+          }
+        },
         {
           "condition": "%{coverage} and %{test-build}",
           "env": {
@@ -199,6 +208,15 @@
             ]
           }
         },
+        {
+          "condition": "%{debugger}",
+          "env": {
+            "IOTJS_BUILD_OPTION": [
+              "--jerry-debugger",
+              "--no-snapshot"
+            ]
+          }
+        },
         {
           "condition": "%{coverage} or %{memstat}",
           "env": { "IOTJS_BUILD_OPTION": ["--compile-flag=-g", "--jerry-compile-flag=-g"] }
@@ -289,6 +307,13 @@
             "--no-snapshot"
           ]
         },
+        {
+          "condition": "%{debugger}",
+          "args": [
+            "--jerry-debugger",
+            "--no-snapshot"
+          ]
+        },
         {
           "condition": "%{coverage} or %{memstat}",
           "args": ["--compile-flag=-g", "--jerry-compile-flag=-g"]

jstest/builder/modules/jerryscript.build.config

@@ -25,7 +25,7 @@
         "--profile=%{jerryscript}/jerry-core/profiles/minimal.profile",
         "--toolchain=%{jerryscript}/cmake/toolchain_mcu_stm32f4.cmake",
         "--compile-flag=-I%{jerryscript}/targets/nuttx-stm32f4",
-        "--compile-flag='-isystem %{nuttx}/include'"
+        "--compile-flag=-isystem %{nuttx}/include"
       ],
       "conditional-options": [
         {
@@ -39,6 +39,12 @@
         {
           "condition": "%{es2015subset-profile-build} or %{test-build}",
           "args": ["--profile=%{jerryscript}/jerry-core/profiles/es2015-subset.profile"]
+        },
+        {
+          "condition": "%{debugger}",
+          "args": [
+            "--jerry-debugger=ON"
+          ]
         }
       ]
     },
@@ -81,6 +87,12 @@
           "condition": "'%{build-type}' == 'debug'",
           "args": ["--debug"]
         },
+        {
+          "condition": "%{debugger}",
+          "args": [
+            "--jerry-debugger=ON"
+          ]
+        },
         {
           "condition": "%{memstat}",
           "args": ["--mem-stats=ON"]
@@ -134,8 +146,10 @@
           "args": ["--mem-stats=ON"]
         },
         {
-          "condition": "%{coverage} or %{memstat}",
-          "args": ["--debug"]
+          "condition": "%{debugger}",
+          "args": [
+            "--jerry-debugger=ON"
+          ]
         },
         {
           "condition": "%{es5.1-profile-build}",

jstest/common/symbol_resolver.py

@@ -116,6 +116,7 @@ def resolve_symbol(symbol, env):
         'flash': not env.options.no_flash,
         'memstat': not env.options.no_memstat,
         'coverage': bool(env.options.coverage),
+        'debugger':bool(env.options.debugger),
         'test-build': 'test-build' in env.options.id,
         'minimal-profile-build': 'minimal-profile-build' in env.options.id,
         'es5.1-profile-build': 'target-es5.1-profile-build' in env.options.id,

jstest/resources/etc/tester.py

@@ -121,6 +121,11 @@ def run_jerry(options):
     if not options.no_memstat:
         args.append('--mem-stats')
 
+    if options.debug_port:
+        args.append('--start-debug-server')
+        args.append('--debug-port')
+        args.append('%s' % options.debug_port)
+
     output, exitcode = execute(options.cwd, options.cmd, args)
 
     mempeak = 'n/a'
@@ -162,10 +167,10 @@ def run_iotjs(options):
     if not options.no_memstat:
         args.append('--mem-stats')
 
-    if options.coverage_port:
+    if options.debug_port:
         args.append('--start-debug-server')
         args.append('--debug-port')
-        args.append('%s' % options.coverage_port)
+        args.append('%s' % options.debug_port)
 
     args.append(options.testfile)
 
@@ -244,10 +249,9 @@ def parse_arguments():
     parser.add_argument('--testfile', metavar='file',
                         help='Test file with path')
 
-    parser.add_argument('--coverage-port',
+    parser.add_argument('--debug-port',
                         metavar='PORT',
-                        help='Specify the PORT for jerry-debugger to'
-                             ' calculate the JS source code coverage')
+                        help='Specify the PORT for jerry-debugger')
 
     parser.add_argument('--no-memstat',
                         action='store_true', default=False,

jstest/testrunner/devices/serial_device.py

@@ -75,11 +75,11 @@ def _prepare_command(self, testset, test):
         if not self.env.options.no_memstat:
             args = ['--mem-stats']
 
-        if self.env.options.coverage and self.device == 'artik053':
-            port = testrunner_utils.read_port_from_url(self.env.options.coverage)
-
-            args.append('--debug-port %s' % port)
+        if self.env.options.debugger and self.env.options.debugger != 'no_address':
+            port = testrunner_utils.read_port_from_url(self.env.options.debugger)
             args.append('--start-debug-server')
+            args.append('--debug-port')
+            args.append('%s' % port)
 
         command = {
             'iotjs': 'iotjs %s %s' % (' '.join(args), testfile),

jstest/testrunner/devices/ssh_device.py

@@ -92,10 +92,11 @@ def execute(self, testset, test):
         if self.env.options.no_memstat:
             command += ' --no-memstat'
 
-        if self.env.options.coverage and self.app == 'iotjs':
-            port = testrunner_utils.read_port_from_url(self.env.options.coverage)
-            command += ' --coverage-port %s' % port
+        if self.env.options.debugger and self.env.options.debugger != 'no_address':
+            port = testrunner_utils.read_port_from_url(self.env.options.debugger)
+            command += ' --debug-port %s' % port
 
+        if self.env.options.coverage:
             # Start the client script on a different thread for coverage.
             client_thread = Thread(target=testrunner_utils.run_coverage_script,
                                    kwargs={'env' :self.env})

pylintrc

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [MESSAGES CONTROL]
-disable=missing-docstring, anomalous-backslash-in-string, attribute-defined-outside-init, import-error, broad-except, redefined-variable-type, superfluous-parens, bad-continuation, eval-used, fixme, too-many-arguments
+disable=missing-docstring, anomalous-backslash-in-string, attribute-defined-outside-init, import-error, broad-except, redefined-variable-type, superfluous-parens, bad-continuation, eval-used, fixme, too-many-arguments, too-many-branches
 
 [REPORTS]