diff options
| -rw-r--r-- | mk/build.mk | 17 | ||||
| -rwxr-xr-x | package/adktest/src/quit | 2 | ||||
| -rw-r--r-- | target/collections/test | 7 |
3 files changed, 12 insertions, 14 deletions
diff --git a/mk/build.mk b/mk/build.mk index f87f0b6cc..3667e7edc 100644 --- a/mk/build.mk +++ b/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 \ diff --git a/package/adktest/src/quit b/package/adktest/src/quit index a625553e2..23080d5a2 100755 --- a/package/adktest/src/quit +++ b/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 diff --git a/target/collections/test b/target/collections/test index bf76d8d31..edb8426d2 100644 --- a/target/collections/test +++ b/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 |