From c94314fa618c682646c07ddd914a5abb77346273 Mon Sep 17 00:00:00 2001
From: Austin Foxley <austinf@cetoncorp.com>
Date: Sat, 17 Oct 2009 13:28:17 -0700
Subject: build system changes needed for nptl

 * add include dir for nptl
 * pregen nptl headers
 * add include dir to pick up subarchs
 * a few tweaks for test/* to match state of the code

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
---
 test/Makefile         | 5 ++++-
 test/Rules.mak        | 6 +++---
 test/Test.mak         | 5 ++---
 test/dlopen/Makefile  | 5 +++++
 test/pthread/Makefile | 1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/Makefile b/test/Makefile
index bd68884d3..857ac8ad9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -26,6 +26,9 @@ endif
 ifneq ($(UCLIBC_HAS_REGEX),y)
 	DIRS := $(filter-out regex,$(DIRS))
 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
@@ -41,7 +44,7 @@ endif
 
 test check all: run
 
-run: subdirs_run
+run: compile subdirs_run
 
 compile: $(top_builddir)/$(LOCAL_INSTALL_PATH) subdirs_compile
 
diff --git a/test/Rules.mak b/test/Rules.mak
index 8e154c590..d31372f78 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -111,9 +111,9 @@ else
 	HOST_LDFLAGS  += -s
 endif
 
-ifneq ($(strip $(HAVE_SHARED)),y)
-	LDFLAGS       += -static
-	HOST_LDFLAGS  += -static
+ifeq ($(strip $(UCLIBC_STATIC)),y)
+	STATIC_LDFLAGS	:= -static
+	HOST_LDFLAGS  	+= -static
 endif
 
 LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
diff --git a/test/Test.mak b/test/Test.mak
index 66565498f..e4f4835e1 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -68,9 +68,8 @@ define exec_test
 endef
 
 test check all: run
-run: $(RUN_TARGETS) compile
-
-$(RUN_TARGETS): $(TARGETS)
+run: $(RUN_TARGETS)
+$(RUN_TARGETS):
 	$(exec_test)
 	$(diff_test)
 ifeq ($(UCLIBC_ONLY),)
diff --git a/test/dlopen/Makefile b/test/dlopen/Makefile
index ef15d861d..66a2452e2 100644
--- a/test/dlopen/Makefile
+++ b/test/dlopen/Makefile
@@ -4,4 +4,9 @@
 top_builddir=../../
 include ../Rules.mak
 -include Makefile.in
+ifeq ($(UCLIBC_STATIC),y)
+TESTS_DISABLED := test3
+LDFLAGS_libtest.so := -lpthread
+endif
+
 include ../Test.mak
diff --git a/test/pthread/Makefile b/test/pthread/Makefile
index d6f00d643..5f2033d42 100644
--- a/test/pthread/Makefile
+++ b/test/pthread/Makefile
@@ -1,6 +1,7 @@
 # uClibc pthread tests
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 
+TESTS_DISABLED += cancellation-points
 top_builddir=../../
 include ../Rules.mak
 -include Makefile.in
-- 
cgit v1.2.3