Changeset 6eb957dc in mainline for uspace/Makefile.common

Timestamp:

2014-10-09T03:34:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ef3da5a

Parents:

fa65df1 (diff), 18cc83c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

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
@@ -85 +86 @@
         JOB = $(LIBRARY).job
         OUTPUT = $(LIBRARY).a
+        TEST_BINARY = test-$(LIBRARY)
 endif
 
@@ -144 +146 @@
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
+LIBTRACKMOD_PREFIX = $(LIB_PREFIX)/trackmod
 
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
@@ -200 +203 @@
 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:
@@ -294 +311 @@
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
+TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES)))
 
 ifneq ($(BINARY),)
@@ -338 +356 @@
 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 $@
@@ -356 +382 @@
 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 $@
@@ -375 +407 @@
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@