summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/build.mk4
-rw-r--r--target/config/Config.in.adk7
-rw-r--r--tests/adk.exp.in4
3 files changed, 12 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 854fdb19d..c8fa47387 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -590,8 +590,10 @@ include $(TOPDIR)/toolchain/gcc/Makefile.inc
check:
@-rm tests/adk.exp tests/master.exp
@sed -e "s#@ADK_TARGET_IP@#$(ADK_TARGET_IP)#" tests/adk.exp.in > \
+ tests/adk.exp.in.tmp
+ @sed -e "s#@ADK_TARGET_PORT@#$(ADK_TARGET_PORT)#" tests/adk.exp.in.tmp > \
tests/adk.exp
@sed -e "s#@TOPDIR@#$(TOPDIR)#" tests/master.exp.in > \
tests/master.exp
env DEJAGNU=$(TOPDIR)/tests/master.exp \
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)-final/gcc check-gcc RUNTESTFLAGS="execute.exp"
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 442094b85..5ff27a6a6 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -66,6 +66,13 @@ config ADK_TARGET_IP
default "127.0.0.1"
help
+config ADK_TARGET_PORT
+ prompt "Set target port for make check"
+ string
+ default "2222" if ADK_HARDWARE_QEMU
+ default "22"
+ help
+
choice
prompt "Hostsystem (do not change!)"
config ADK_HOST_LINUX
diff --git a/tests/adk.exp.in b/tests/adk.exp.in
index 7b35b775d..c5a7b8948 100644
--- a/tests/adk.exp.in
+++ b/tests/adk.exp.in
@@ -1,5 +1,5 @@
load_generic_config "unix";
set_board_info hostname @ADK_TARGET_IP@
set_board_info username root
-set_board_info rsh_prog /usr/bin/ssh
-set_board_info rcp_prog /usr/bin/scp
+set_board_info rsh_prog "/usr/bin/ssh -p @ADK_TARGET_PORT@"
+set_board_info rcp_prog "/usr/bin/scp -P @ADK_TARGET_PORT@"