diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-01 11:35:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-01 11:35:22 +0200 |
| commit | 45289b0b77f5ded061192f59a1b5c6bf01f319b1 (patch) | |
| tree | b9cb1cd44cc36226088d04e398cef84433de4259 | |
| parent | 0ac877a4f3bdd0a93354a18d8aa2dff098d75699 (diff) | |
uclibc-ng: move test building to package/uclibc-ng
After the one libc release some tests for ppc/xtensa are
failing when the testsuite is not build with the full shared
gcc instead of the non-shared gcc.
| -rw-r--r-- | package/uclibc-ng/Makefile | 17 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 32 |
2 files changed, 18 insertions, 31 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 676ee722d..35590af0c 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -29,6 +29,23 @@ CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual +do-build: +ifeq ($(ADK_PACKAGE_UCLIBC_NG_TEST),y) + PATH='$(HOST_PATH)' $(MAKE) -j1 -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ + HOSTCC='$(HOST_CC)' \ + CC='$(TARGET_CC)' \ + PREFIX=$(STAGING_TARGET_DIR) \ + DEVEL_PREFIX=/usr/ \ + DEVEL_PREFIX_LIB=/ \ + RUNTIME_PREFIX=/ \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + TEST_INSTALLED_UCLIBC=1 \ + UCLIBC_ONLY=1 \ + VERBOSE=1 \ + test_gen test_compile +endif + do-install: ${INSTALL_DIR} $(IDIR_UCLIBC_NG)/$(ADK_TARGET_LIBC_PATH) $(IDIR_UCLIBC_NG)/etc test -z $(ADK_RUNTIME_TIMEZONE) || \ diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 1bfa7f360..192b34daa 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -308,23 +308,8 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ VERBOSE=1 \ - all - PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ - HOSTCC="$(HOST_CC)" \ - CC='$(TARGET_CC)' \ - PREFIX=$(STAGING_TARGET_DIR) \ - DEVEL_PREFIX=/usr/ \ - DEVEL_PREFIX_LIB=/ \ - RUNTIME_PREFIX=/ \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ - VERBOSE=1 \ - utils + all utils touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled @@ -337,23 +322,8 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ VERBOSE=1 \ install_runtime install_dev install_utils - PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ - HOSTCC="$(HOST_CC)" \ - CC='$(TARGET_CC)' \ - PREFIX=$(STAGING_TARGET_DIR) \ - DEVEL_PREFIX=/usr/ \ - DEVEL_PREFIX_LIB=/ \ - RUNTIME_PREFIX=/ \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - TEST_INSTALLED_UCLIBC=1 \ - UCLIBC_ONLY=1 \ - VERBOSE=1 \ - test_gen test_compile touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk |