diff options
Diffstat (limited to 'test/Test.mak')
| -rw-r--r-- | test/Test.mak | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/test/Test.mak b/test/Test.mak index c9b1f5a..14ccb7f 100644 --- a/test/Test.mak +++ b/test/Test.mak @@ -1,7 +1,4 @@ # Common makefile rules for tests -# -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> -# # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. shellescape='$(subst ','\'',$(1))' @@ -20,29 +17,16 @@ ifneq ($(filter-out test,$(strip $(TESTS))),$(strip $(TESTS))) $(error Sanity check: cannot have a test named "test.c") endif -U_TARGETS := $(TESTS) -G_TARGETS := $(addsuffix _glibc,$(U_TARGETS)) +TARGETS := $(TESTS) -ifneq ($(GLIBC_TESTS_DISABLED),) -G_TARGETS := $(filter-out $(GLIBC_TESTS_DISABLED),$(G_TARGETS)) -endif - -ifeq ($(GLIBC_ONLY),) -TARGETS += $(U_TARGETS) -endif -ifeq ($(UCLIBC_ONLY),) -TARGETS += $(G_TARGETS) -endif - -CLEAN_TARGETS := $(U_TARGETS) $(G_TARGETS) -CLEAN_TARGETS += $(TESTS_DISABLED) $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) +CLEAN_TARGETS := $(TARGETS) +CLEAN_TARGETS += $(TESTS_DISABLED) COMPILE_TARGETS := $(TARGETS) # We sort the targets so uClibc and host-libc tests are run adjacent RUN_TARGETS := $(sort $(addsuffix .exe,$(TARGETS))) COMPILE_TARGETS := $(sort $(COMPILE_TARGETS)) # provide build rules even for disabled tests: -U_TARGETS += $(TESTS_DISABLED) -G_TARGETS += $(addsuffix _glibc,$(TESTS_DISABLED)) $(GLIBC_TESTS_DISABLED) +TARGETS += $(TESTS_DISABLED) TARGETS += $(SHELL_TESTS) CFLAGS += $(CFLAGS_$(notdir $(CURDIR))) ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) @@ -91,8 +75,7 @@ endef test check all: run run: $(RUN_TARGETS) -$(addsuffix .exe,$(U_TARGETS)): SIMULATOR:=$(SIMULATOR_uclibc) -$(addsuffix .exe,$(G_TARGETS)): SIMULATOR:=$(SIMULATOR_glibc) +$(addsuffix .exe,$(TARGETS)): SIMULATOR:=$(SIMULATOR) $(RUN_TARGETS): ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) $(Q)\ @@ -106,32 +89,19 @@ ifeq (1,$(UCLIBCNG_GENERATE_TESTRUNNER)) else $(exec_test) $(diff_test) -ifeq ($(UCLIBC_ONLY),) - $(uclibc_glibc_diff_test) -endif endif compile: $(COMPILE_TARGETS) -G_TARGET_SRCS := $(addsuffix .c,$(G_TARGETS)) -U_TARGET_SRCS := $(addsuffix .c,$(U_TARGETS)) +TARGET_SRCS := $(addsuffix .c,$(TARGETS)) MAKE_SRCS := $(wildcard Makefile.in) $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak -$(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) +$(TARGETS): $(TARGET_SRCS) $(MAKE_SRCS) $(showlink) $(Q)$(CC) $(filter-out $(CFLAGS-OMIT-$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o $(Q)$(CC) $(filter-out $(LDFLAGS-OMIT-$@),$(LDFLAGS)) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@) -$(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS) - $(showlink) - $(Q)$(HOSTCC) $(filter-out $(HOST_CFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) \ - $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) \ - -c $(patsubst %_glibc,%,$@).c -o $@.o - $(Q)$(HOSTCC) $(filter-out $(LDFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(HOST_LDFLAGS)) \ - $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@)) $(LDFLAGS_$@) - - shell_%: $(showtest) $(Q)$(if $(PRE_RUN_$(@)),$(PRE_RUN_$(@))) |