svn commit: branches/uClibc-nptl: test

[carmelo at uclibc.org]

Author: carmelo
Date: 2008-07-11 09:21:28 -0700 (Fri, 11 Jul 2008)
New Revision: 22788

Log:
Resynch with trunk fixing problem on test build system due to my last commit

Modified:
   branches/uClibc-nptl/Makefile.in
   branches/uClibc-nptl/Rules.mak
   branches/uClibc-nptl/test/Makefile
   branches/uClibc-nptl/test/Rules.mak


Changeset:
Modified: branches/uClibc-nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/Makefile.in	2008-07-11 16:16:04 UTC (rev 22787)
+++ branches/uClibc-nptl/Makefile.in	2008-07-11 16:21:28 UTC (rev 22788)
@@ -514,7 +514,7 @@
 	$(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)

Modified: branches/uClibc-nptl/Rules.mak
===================================================================
--- branches/uClibc-nptl/Rules.mak	2008-07-11 16:16:04 UTC (rev 22787)
+++ branches/uClibc-nptl/Rules.mak	2008-07-11 16:21:28 UTC (rev 22788)
@@ -81,8 +81,8 @@
 # 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)

Modified: branches/uClibc-nptl/test/Makefile
===================================================================
--- branches/uClibc-nptl/test/Makefile	2008-07-11 16:16:04 UTC (rev 22787)
+++ branches/uClibc-nptl/test/Makefile	2008-07-11 16:21:28 UTC (rev 22788)
@@ -29,11 +29,21 @@
 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
 

Modified: branches/uClibc-nptl/test/Rules.mak
===================================================================
--- branches/uClibc-nptl/test/Rules.mak	2008-07-11 16:16:04 UTC (rev 22787)
+++ branches/uClibc-nptl/test/Rules.mak	2008-07-11 16:21:28 UTC (rev 22788)
@@ -82,7 +82,7 @@
 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)