diff options
author | Austin Foxley <austinf@cetoncorp.com> | 2009-11-28 22:00:53 -0800 |
---|---|---|
committer | Austin Foxley <austinf@cetoncorp.com> | 2009-11-28 22:40:05 -0800 |
commit | 8359f22a288236613e64f2b3e96ef6e2ac2de097 (patch) | |
tree | 04967bfdadf913d1f8a70ddf5769446d963546dd /test/Test.mak | |
parent | 5418ef694ee17c698270702d927f04836706e60b (diff) | |
parent | 8739ed0a9b6597e7106f878ec159a19fe0848f23 (diff) |
Merge remote branch 'origin/master' into nptl
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/Test.mak')
-rw-r--r-- | test/Test.mak | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/Test.mak b/test/Test.mak index 0c5629144..6aa835623 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -29,10 +29,14 @@ TARGETS += $(G_TARGETS) endif CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS) +CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _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)) TARGETS += $(SHELL_TESTS) -CFLAGS+=$(CFLAGS_$(notdir $(CURDIR))) +CFLAGS += $(CFLAGS_$(notdir $(CURDIR))) define binary_name $(patsubst %.exe,%,$@) @@ -100,7 +104,9 @@ $(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) shell_%: $(showtest) + $(Q)$(if $(PRE_RUN_$(@)),$(PRE_RUN_$(@))) $(Q)$(SHELL) $(patsubst shell_%,%.sh,$(binary_name)) + $(Q)$(if $(POST_RUN_$(@)),$(POST_RUN_$(@))) %.so: %.c $(showlink) |