summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-25 14:55:25 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-25 14:55:42 (GMT)
commit0f438808581c6ad512f30bb022018cc05360a5c1 (patch)
tree9d6dff679598b0117774220e95ab48fffb938ba1
parent1ab0cac2bdc797f84cec28f3d545cb9d37921fc4 (diff)
use shell based testrunner for uClibc-ng git
-rw-r--r--package/uclibc-ng/Config.in.manual1
-rw-r--r--toolchain/uclibc-ng/Makefile11
2 files changed, 11 insertions, 1 deletions
diff --git a/package/uclibc-ng/Config.in.manual b/package/uclibc-ng/Config.in.manual
index 8e7b6c2..57bce54 100644
--- a/package/uclibc-ng/Config.in.manual
+++ b/package/uclibc-ng/Config.in.manual
@@ -8,7 +8,6 @@ config ADK_PACKAGE_UCLIBC_NG
config ADK_PACKAGE_UCLIBC_NG_TEST
bool "uClibc-ng-test.......... embedded C library (testsuite)"
- select ADK_PACKAGE_MAKE if !ADK_TARGET_UCLINUX
select ADK_PACKAGE_LIBRT if !ADK_TARGET_UCLINUX
select ADK_PACKAGE_LIBPTHREAD if !ADK_TARGET_UCLINUX
select ADK_UCLIBC_TEST
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index c34ff91..6aaae53 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -282,6 +282,16 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.install_headers
$(WRKBUILD)/.fixup:
ifeq ($(ADK_UCLIBC_TEST),y)
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_GIT),y)
+ PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
+ CC='$(TARGET_CC)' \
+ TEST_INSTALLED_UCLIBC=1 \
+ UCLIBC_ONLY=1 \
+ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+ VERBOSE=1 \
+ test_compile test_gen
+else
PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \
CC='$(TARGET_CC)' \
TEST_INSTALLED_UCLIBC=1 \
@@ -291,6 +301,7 @@ ifeq ($(ADK_UCLIBC_TEST),y)
VERBOSE=1 \
test_compile
endif
+endif
ifeq ($(ADK_TARGET_TOOLCHAIN),y)
# cleanup toolchain
-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -exec rm {} \;