Changeset 134ac5d in mainline for uspace/lib/pcut/tests/tests.mak

Timestamp:

2014-06-06T07:54:24Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8db09e4

Parents:

eeb23f2d

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/tests/tests.mak (modified) (3 diffs)

uspace/lib/pcut/tests/tests.mak

@@ -27 +27 @@
 #
 
-TEST_DEPS = $(TEST_BASE)tested.o $(PCUT_LIB)
+TEST_DEPS = $(TEST_BASE)tested.o
 
 TEST_APPS = \
         $(TEST_BASE)alloc.$(EXE_EXT) \
         $(TEST_BASE)asserts.$(EXE_EXT) \
+        $(TEST_BASE)errno.$(EXE_EXT) \
         $(TEST_BASE)manytests.$(EXE_EXT) \
         $(TEST_BASE)multisuite.$(EXE_EXT) \
@@ -38 +39 @@
         $(TEST_BASE)printing.$(EXE_EXT) \
         $(TEST_BASE)simple.$(EXE_EXT) \
+        $(TEST_BASE)skip.$(EXE_EXT) \
         $(TEST_BASE)suites.$(EXE_EXT) \
-        $(TEST_BASE)teardown.$(EXE_EXT)
+        $(TEST_BASE)teardown.$(EXE_EXT) \
+        $(TEST_BASE)timeout.$(EXE_EXT)
 
 check-build: $(TEST_APPS)
@@ -46 +49 @@
 
 check-clean:
-        rm -f $(TEST_BASE)*.o $(TEST_BASE)*.$(EXE_EXT) $(TEST_BASE)*.got
+        rm -f $(TEST_BASE)*.o $(TEST_BASE)*.pcut.c $(TEST_BASE)*.$(EXE_EXT) $(TEST_BASE)*.got
 
 $(TEST_BASE)%.$(EXE_EXT): $(TEST_DEPS)
-        $(CC) -o $@ $^ $(TEST_LDFLAGS)
+        $(LD) -o $@ $^ $(TEST_LDFLAGS)
 
-$(TEST_BASE)alloc.$(EXE_EXT): $(TEST_BASE)alloc.o
-$(TEST_BASE)asserts.$(EXE_EXT): $(TEST_BASE)asserts.o
-$(TEST_BASE)manytests.$(EXE_EXT): $(TEST_BASE)manytests.o
-$(TEST_BASE)multisuite.$(EXE_EXT): $(TEST_BASE)suite_all.o $(TEST_BASE)suite1.o $(TEST_BASE)suite2.o
-$(TEST_BASE)null.$(EXE_EXT): $(TEST_BASE)null.o
-$(TEST_BASE)nullteardown.$(EXE_EXT): $(TEST_BASE)nullteardown.o
-$(TEST_BASE)printing.$(EXE_EXT): $(TEST_BASE)printing.o
-$(TEST_BASE)simple.$(EXE_EXT): $(TEST_BASE)simple.o
-$(TEST_BASE)suites.$(EXE_EXT): $(TEST_BASE)suites.o
-$(TEST_BASE)teardown.$(EXE_EXT): $(TEST_BASE)teardown.o
+$(TEST_BASE)alloc.$(EXE_EXT): $(TEST_BASE)alloc.o $(PCUT_LIB)
+$(TEST_BASE)asserts.$(EXE_EXT): $(TEST_BASE)asserts.o $(PCUT_LIB)
+$(TEST_BASE)errno.$(EXE_EXT): $(TEST_BASE)errno.o $(PCUT_LIB)
+$(TEST_BASE)manytests.$(EXE_EXT): $(TEST_BASE)manytests.o $(PCUT_LIB)
+$(TEST_BASE)multisuite.$(EXE_EXT): $(TEST_BASE)suite_all.o $(TEST_BASE)suite1.o $(TEST_BASE)suite2.o $(PCUT_LIB)
+$(TEST_BASE)null.$(EXE_EXT): $(TEST_BASE)null.o $(PCUT_LIB)
+$(TEST_BASE)nullteardown.$(EXE_EXT): $(TEST_BASE)nullteardown.o $(PCUT_LIB)
+$(TEST_BASE)printing.$(EXE_EXT): $(TEST_BASE)printing.o $(PCUT_LIB)
+$(TEST_BASE)simple.$(EXE_EXT): $(TEST_BASE)simple.o $(PCUT_LIB)
+$(TEST_BASE)skip.$(EXE_EXT): $(TEST_BASE)skip.o $(PCUT_LIB)
+$(TEST_BASE)suites.$(EXE_EXT): $(TEST_BASE)suites.o $(PCUT_LIB)
+$(TEST_BASE)teardown.$(EXE_EXT): $(TEST_BASE)teardown.o $(PCUT_LIB)
+$(TEST_BASE)timeout.$(EXE_EXT): $(TEST_BASE)timeout.o $(PCUT_LIB)
 
+
+ifeq ($(NEEDS_PREPROC),y)
+$(TEST_BASE)%.o: $(TEST_BASE)%.pcut.c
+        $(CC) -c -o $@ $(TEST_CFLAGS) $<
+
+$(TEST_BASE)%.pcut.c: $(TEST_BASE)%.c $(PCUT_PREPROC)
+        $(CC) -E $(TEST_CFLAGS) $< | $(PCUT_PREPROC) >$@
+else
 $(TEST_BASE)%.o: $(TEST_BASE)%.c
         $(CC) -c -o $@ $(TEST_CFLAGS) $<
+endif