Browse Source

rework adk test stuff, use netcat to avoid socat/fork for non-MMU

Waldemar Brodkorb 10 years ago
parent
commit
b83641c86a
3 changed files with 12 additions and 14 deletions
  1. 11 6
      mk/build.mk
  2. 1 1
      package/adktest/src/quit
  3. 0 7
      target/collections/test

+ 11 - 6
mk/build.mk

@@ -348,21 +348,26 @@ endif
 	@if [ ! -z "$(ADK_NO_CHECKSUM)" ];then \
 		echo "ADK_DISABLE_CHECKSUM=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_LTP)" ];then \
+	@if [ ! -z "$(ADK_TEST_BASE)" ];then \
+		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
+		echo "ADK_PACKAGE_FILE=y" >> $(ADK_TOPDIR)/.defconfig; \
+		echo "ADK_PACKAGE_BINUTILS=y" >> $(ADK_TOPDIR)/.defconfig; \
+	fi
+	@if [ ! -z "$(ADK_TEST_LTP)" ];then \
+		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_LTP=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_UCLIBC_TEST)" ];then \
+	@if [ ! -z "$(ADK_TEST_UCLIBC_TESTSUITE)" ];then \
+		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_UCLIBC_NG_TEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
-	@if [ ! -z "$(ADK_UCLIBC_NATIVE)" ];then \
+	@if [ ! -z "$(ADK_TEST_UCLIBC_NATIVE)" ];then \
+		echo "ADK_PACKAGE_ADKTEST=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_GCC=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_BINUTILS=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_MAKE=y" >> $(ADK_TOPDIR)/.defconfig; \
 		echo "ADK_PACKAGE_UCLIBC_NG_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \
-		echo "ADK_KERNEL_IPV6=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
 		grep "^config" target/config/Config.in.arch.choice \

+ 1 - 1
package/adktest/src/quit

@@ -1,2 +1,2 @@
 #!/bin/sh
-socat exec:/usr/bin/qmp tcp:10.0.2.2:4444
+/usr/bin/qmp |nc 10.0.2.2 4444

+ 0 - 7
target/collections/test

@@ -1,16 +1,9 @@
 config ADK_PKG_TEST
 	bool "Compile a ADK test framework system"
 	select ADK_PACKAGE_ADKTEST
-	select ADK_PACKAGE_SOCAT
 	select ADK_PACKAGE_RDATE
-	select ADK_PACKAGE_FILE
-	select ADK_PACKAGE_BINUTILS
-	select ADK_TARGET_PACKAGE_TXZ
 	select ADK_RUNTIME_START_SERVICES
 	select ADK_RUNTIME_START_ADKTEST
-	select ADK_KERNEL_BLK_DEV_INITRD
-	select ADK_KERNEL_COMP_XZ
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
 	select ADK_KERNEL_IPV6
 	default n
 	help