Browse Source

add TCP port configuration for typical Qemu setup

Waldemar Brodkorb 12 years ago
parent
commit
6c4dbdadde
3 changed files with 12 additions and 3 deletions
  1. 3 1
      mk/build.mk
  2. 7 0
      target/config/Config.in.adk
  3. 2 2
      tests/adk.exp.in

+ 3 - 1
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"

+ 7 - 0
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

+ 2 - 2
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@"