diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-07-06 04:21:22 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2007-07-06 04:21:22 +0000 |
| commit | 9fba54740004859fd7e0936cda64d01c2b48633b (patch) | |
| tree | 04415562b657c73f5db8fec0cace41c458399f40 /package/ltp-testsuite/ltp-testsuite.mk | |
| parent | e8b93caa826a838971e53bb04189e225c2e8250f (diff) | |
Fix patch filtering and add new patch to disable tests for IPv6 when not selected.
Diffstat (limited to 'package/ltp-testsuite/ltp-testsuite.mk')
| -rw-r--r-- | package/ltp-testsuite/ltp-testsuite.mk | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index f5a18aad4..575a2eea2 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -11,19 +11,21 @@ LTP_TESTSUITE_ROOT:=$(TARGET_DIR)/root LTP_TESTSUITE_DIR:=$(LTP_TESTSUITE_ROOT)/ltp-full-$(LTP_TESTSUITE_VERSION) # -# We enable Open POSIX Testsuite if Native POSIX Threads Library (NPTL) -# is selected. Otherwise, we filter out the patch for it. +# Enable patches based upon different toolchain configuration options. # -LTP_PATCHES:=$(subst package/ltp-testsuite/,, \ - $(wildcard package/ltp-testsuite/*.patch)) +LTP_PATCHES:=ltp-testsuite-generate-needs-bash.patch \ + ltp-testsuite-sh-is-not-C-code.patch \ + ltp-testsuite.patch -ifneq ($(BR2_PTHREADS_NATIVE),y) - ifneq ($(BR2_EXT_PTHREADS_NATIVE),y) -LTP_PATCHES:=$(filter-out ltp-testsuite-enable-openposix-for-nptl.patch, \ - $(LTP_PATCHES)) - endif +ifeq ($(BR2_PTHREADS_NATIVE),y) +LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch +endif +ifeq ($(BR2_EXT_PTHREADS_NATIVE),y) +LTP_PATCHES+=ltp-testsuite-enable-openposix-for-nptl.patch +endif +ifneq ($(BR2_INET_IPV6),y) +LTP_PATCHES+=ltp-testsuite-disable-ipv6-tests.patch endif - $(DL_DIR)/$(LTP_TESTSUITE_SOURCE): $(WGET) -P $(DL_DIR) $(LTP_TESTSUITE_SITE)/$(LTP_TESTSUITE_SOURCE) @@ -41,10 +43,6 @@ $(LTP_TESTSUITE_DIR)/.compiled: $(LTP_TESTSUITE_DIR)/Makefile -C $(LTP_TESTSUITE_DIR) all touch $@ -sjh: $(LTP_TESTSUITE_DIR)/Makefile - $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) \ - -C $(LTP_TESTSUITE_DIR) all - $(LTP_TESTSUITE_DIR)/.installed: $(LTP_TESTSUITE_DIR)/.compiled # Use fakeroot to pretend to do 'make install' as root echo '$(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS_COMPILER=$(TARGET_CROSS) ' \ |