Changes in uspace/Makefile.common [a047aaa:7e69e0e] in mainline

File:

• uspace/Makefile.common (modified) (8 diffs)

uspace/Makefile.common

@@ -78 +78 @@
         JOB = $(BINARY).job
         OUTPUT = $(BINARY)
-        TEST_BINARY = test-$(BINARY)
         EXTRA_OUTPUT += $(BINARY).disasm
         EXTRA_CLEAN += $(BINARY).map
@@ -86 +85 @@
         JOB = $(LIBRARY).job
         OUTPUT = $(LIBRARY).a
-        TEST_BINARY = test-$(LIBRARY)
 endif
 
@@ -144 +142 @@
 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
-LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
@@ -204 +201 @@
 endif
 
-# PCUT-based unit tests
-ifneq ($(TEST_SOURCES),)
-        TEST_OUTPUT = $(TEST_BINARY)
-        TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__
-        TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
-        EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map
-ifneq ($(LIBRARY),)
-        TEST_OUTPUT_LIBS += $(OUTPUT)
-endif
-        TEST_OUTPUT_LIBS += $(TEST_LIBS)
-endif
-
 .PHONY: all clean
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
-
-all-test: $(TEST_OUTPUT)
 
 clean:
@@ -312 +295 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
-TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES)))
 
 ifneq ($(BINARY),)
@@ -357 +339 @@
 endif
 
-ifneq ($(TEST_OUTPUT),)
-$(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
-ifeq ($(CONFIG_STRIP_BINARIES),y)
-        $(STRIP) $(TEST_OUTPUT)
-endif
-endif
-
 %.o: %.S $(DEPEND)
         $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
@@ -383 +357 @@
 endif
 
-%.test.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
-endif
-
 %.lo: %.S $(DEPEND)
         $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
@@ -408 +376 @@
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@