diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Rules.mak | 4 | ||||
| -rw-r--r-- | test/Makefile | 12 | ||||
| -rw-r--r-- | test/Rules.mak | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 7413d8f78..cd4e995f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -514,7 +514,7 @@ dist release: $(TAR) cjf ../uClibc-$(VERSION).tar.bz2 -C .. uClibc-$(VERSION) du -b ../uClibc-$(VERSION).tar.bz2 -test check: +test check: test_compile $(Q)$(MAKE) -C test test_compile: $(LOCAL_INSTALL_PATH) @@ -81,8 +81,8 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS # Now config hard core MAJOR_VERSION := 0 MINOR_VERSION := 9 -SUBLEVEL := 29 -EXTRAVERSION := +SUBLEVEL := 30 +EXTRAVERSION := rc1 VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) ifneq ($(EXTRAVERSION),) VERSION := $(VERSION)$(EXTRAVERSION) diff --git a/test/Makefile b/test/Makefile index 5f599aa83..420bc05b4 100644 --- a/test/Makefile +++ b/test/Makefile @@ -29,11 +29,21 @@ endif ifneq ($(UCLIBC_HAS_THREADS_NATIVE),y) DIRS += $(filter-out tls nptl,$(DIRS)) endif +ifneq ($(UCLIBC_HAS_WCHAR),y) + DIRS := $(filter-out locale-mbwc,$(DIRS)) +endif +ifneq ($(UCLIBC_HAS_LOCALE),y) + DIRS := $(filter-out locale,$(DIRS)) +endif +ifeq ($(UCLIBC_HAS_CRYPT_STUB),y) + DIRS := $(filter-out crypt,$(DIRS)) +endif +DIRS := $(filter-out math,$(DIRS)) test check all: run -run: subdirs_run +run: compile subdirs_run compile: subdirs_compile diff --git a/test/Rules.mak b/test/Rules.mak index 984221cd3..10fbe869f 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -82,7 +82,7 @@ XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test CFLAGS := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include CC_IPREFIX:=$(shell $(CC) --print-file-name=include) -CFLAGS += -I$(CC_IPREFIX) +CFLAGS += -I$(dir $(CC_IPREFIX))/include-fixed -I$(CC_IPREFIX) HOST_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) |