diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | mk/build.mk | 4 | ||||
-rw-r--r-- | target/config/Config.in.adk | 7 | ||||
-rw-r--r-- | target/linux/config/Config.in.block | 6 | ||||
-rw-r--r-- | target/linux/config/Config.in.netdevice | 2 | ||||
-rw-r--r-- | target/x86/Makefile | 6 | ||||
-rw-r--r-- | tests/adk.exp | 5 | ||||
-rw-r--r-- | tests/adk.exp.in | 4 | ||||
-rw-r--r-- | tests/master.exp | 4 | ||||
-rw-r--r-- | tests/master.exp.in | 1 |
10 files changed, 21 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 51956e85e..fba1c551e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ /config/zconf.tab.h /tests/master.exp /tests/adk.exp +/tests/adk.exp.in.tmp /prereq.mk /toolchain_build_*/ /.ADK_HAVE_DOT_CONFIG 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/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 8f673438d..fdafb06b0 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -121,11 +121,11 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD - default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 - default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL + default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL - default y if ADK_TARGET_SYSTEM_QEMU_X86 + default y if ADK_TARGET_SYSTEM_QEMU_PPC + default y if ADK_TARGET_SYSTEM_QEMU_SPARC default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index 72442e57d..2f9b87200 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -146,7 +146,7 @@ config ADK_KERNEL_E1000 select ADK_KERNEL_NETDEV_1000 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_QEMU_X86 + default y if ADK_TARGET_SYSTEM_QEMU_I686 default y if ADK_TARGET_SYSTEM_QEMU_X86_64 default n help diff --git a/target/x86/Makefile b/target/x86/Makefile index 436ca25ce..dc17f0756 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -23,7 +23,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL) @echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo "Use following command to create a QEMU Image:" @echo "sudo ./scripts/create-image.sh -f ${ADK_TARGET_ROOTFS} qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @@ -41,7 +41,7 @@ imageinstall: $(BIN_DIR)/$(INITRAMFS) @cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL) @echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}' @echo 'The initramfs image is: ${BIN_DIR}/${INITRAMFS}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL) -initrd ${BIN_DIR}/${INITRAMFS}' endif @@ -50,7 +50,7 @@ ifeq ($(ADK_TARGET_FS),initramfs-piggyback) imageinstall: ${BUILD_DIR}/${INITRAMFS_PIGGYBACK} createinitramfs @cp $(KERNEL) $(BIN_DIR)/${TARGET_KERNEL} @echo 'The kernel+initramfs file is: $(BIN_DIR)/${TARGET_KERNEL}' -ifeq ($(ADK_TARGET_SYSTEM_QEMU_X86),y) +ifeq ($(ADK_HARDWARE_QEMU),y) @echo "Start qemu with following command line:" @echo 'qemu -nographic -net user,hostfwd=tcp::2222-:22 -net nic,model=e1000 -kernel $(BIN_DIR)/$(TARGET_KERNEL)' endif diff --git a/tests/adk.exp b/tests/adk.exp deleted file mode 100644 index 537173234..000000000 --- a/tests/adk.exp +++ /dev/null @@ -1,5 +0,0 @@ -load_generic_config "unix"; -set_board_info hostname 192.168.1.24 -set_board_info username root -set_board_info rsh_prog /usr/bin/ssh -set_board_info rcp_prog /usr/bin/scp 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@" diff --git a/tests/master.exp b/tests/master.exp deleted file mode 100644 index 0617230d2..000000000 --- a/tests/master.exp +++ /dev/null @@ -1,4 +0,0 @@ -lappend boards_dir /home/wbx/openadk/tests -lappend boards_dir /usr/share/dejagnu -set myboard adk -set target_list adk diff --git a/tests/master.exp.in b/tests/master.exp.in index 297c0ce5d..72d8ab9e6 100644 --- a/tests/master.exp.in +++ b/tests/master.exp.in @@ -2,3 +2,4 @@ lappend boards_dir @TOPDIR@/tests lappend boards_dir /usr/share/dejagnu set myboard adk set target_list adk +set verbose 1 |