diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-29 19:37:13 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-29 19:37:13 -0800 |
commit | 4d91ad3daa7260427e96ce1d6c62962795c9dbd5 (patch) | |
tree | 24c60035e94cc6db72eed00a36da9241a23a3585 /test/Test.mak | |
parent | 6b4b650e05b81134ec07ee19df82f22e7c845c12 (diff) |
test/: compile fixes for nptl and tls tests
* Add a GLIBC_TESTS_DISABLED var because many of these tests
need internal uClibc stuff. This disables the HOSTCC build of
these tests
* Fix up tls test macros for x86
* Fix the linking of the tls tests
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/Test.mak')
-rw-r--r-- | test/Test.mak | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/Test.mak b/test/Test.mak index 6aa835623..43562f2d7 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -21,6 +21,10 @@ endif U_TARGETS := $(TESTS) G_TARGETS := $(addsuffix _glibc,$(U_TARGETS)) +ifneq ($(GLIBC_TESTS_DISABLED),) +G_TARGETS := $(filter-out $(GLIBC_TESTS_DISABLED),$(G_TARGETS)) +endif + ifeq ($(GLIBC_ONLY),) TARGETS += $(U_TARGETS) endif @@ -29,12 +33,12 @@ TARGETS += $(G_TARGETS) endif CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS) -CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) +CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) COMPILE_TARGETS := $(TARGETS) RUN_TARGETS := $(addsuffix .exe,$(TARGETS)) # provide build rules even for disabled tests: U_TARGETS += $(TESTS_DISABLED) -G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) +G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) TARGETS += $(SHELL_TESTS) CFLAGS += $(CFLAGS_$(notdir $(CURDIR))) |