Merge pull request #5 from syntacore/en-sc/backport-jtag-exec-9

Update `jtag execute`-related patches.

Author: en-sc

Makefile.am

@@ -34,6 +34,9 @@ DIST_SUBDIRS += testing
 SUBDIRS += tools/syntacore
 DIST_SUBDIRS += tools/syntacore
 
+SUBDIRS += testing
+DIST_SUBDIRS += testing
+
 # common flags used in openocd build
 AM_CFLAGS = $(GCC_WARNINGS)
 AM_LDFLAGS =

src/jtag/tcl.c

@@ -1017,7 +1017,7 @@ static const struct command_registration jtag_subcommand_handlers[] = {
 	},
 	{
 		.name = "execute",
-		.mode = COMMAND_ANY,
+		.mode = COMMAND_EXEC,
 		.handler = handle_jtag_execute,
 		.help = "Execute a chain of JTAG commands",
 		.usage = "['scan' tap_name+ ['" JTAG_EXECUTE_SCAN_IR_START_ARG

testing/tcl_commands/test-drscan-command.cfg

@@ -5,6 +5,7 @@ namespace import jtag_dummy_testing::*
 
 set ntaps 1
 setup $ntaps
+init
 
 set tap [lindex [jtag names] 0]
 

testing/tcl_commands/test-irscan-command.cfg

@@ -5,6 +5,7 @@ namespace import jtag_dummy_testing::*
 
 set ntaps 1
 setup $ntaps
+init
 
 set tap [lindex [jtag names] 0]
 

testing/tcl_commands/test-jtag-execute-command.cfg

@@ -4,11 +4,15 @@ namespace import testing_helpers::*
 namespace import jtag_dummy_testing::*
 
 set ntaps 2
-setup $ntaps
 
+setup $ntaps
 set tap [lindex [jtag names] 0]
 set second_tap [lindex [jtag names] 1]
 
+check_generic_error {jtag execute scan $tap -ir 0}
+
+init
+
 set escaped_tap [string map {. {\.}} $tap]
 
 jtag execute scan $tap

testing/tcl_commands/utils.tcl

@@ -26,6 +26,10 @@ namespace eval testing_helpers {
 		}
 	}
 
+	proc check_generic_error script {
+		tailcall check_for_error 1 {} $script
+	}
+
 	proc check_invalid_arg script {
 		tailcall check_for_error -603 {} $script
 	}
@@ -50,8 +54,8 @@ namespace eval testing_helpers {
 			Was expecting '$pattern'."
 	}
 
-	namespace export check_invalid_arg check_syntax_err check_overflow_err \
-		check_underflow_err check_matches
+	namespace export check_generic_error check_invalid_arg check_syntax_err \
+		check_overflow_err check_underflow_err check_matches
 }
 
 namespace eval jtag_dummy_testing {
@@ -67,7 +71,6 @@ namespace eval jtag_dummy_testing {
 		for {set i 0} {$i < $ntaps} {incr i} {
 			jtag newtap "tap$i" tap -irlen 1
 		}
-		init
 		dummy update_context
 		dummy_set_default_handlers