Changes in / [15d0046:105d8d6] in mainline


Ignore:
Files:
60 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r15d0046 r105d8d6  
    600600! CONFIG_WRITE_CORE_FILES (n/y)
    601601
    602 % Build userspace unit tests (PCUT)
    603 ! CONFIG_PCUT_TESTS (n/y)
    604 
    605602% Include development files (headers, libraries)
    606603! CONFIG_DEVEL_FILES (n/y)

  • boot/Makefile

    r15d0046 r105d8d6  
    6868                cp "$$file" "$(DIST_PATH)/app/" ; \
    6969        done
    70 ifeq ($(CONFIG_PCUT_TESTS),y)
    71         echo "echo Running all tests..." >"$(DIST_PATH)/test/run_all"
    72         echo "<html><head><title>HelenOS test results</title></head><body>" >"$(DIST_PATH)/test/test.html"
    73         echo "<h1>HelenOS test results</h1><ul>" >>"$(DIST_PATH)/test/test.html"
    74         for file in $(RD_TESTS) ; do \
    75                 file2=`basename $$file`; \
    76                 cp "$$file" "$(DIST_PATH)/test/" ; \
    77                 echo "echo ' ->' $$file2" >>"$(DIST_PATH)/test/run_all"; \
    78                 echo "/test/$$file2 | to /test/$$file2.out" >>"$(DIST_PATH)/test/run_all"; \
    79                 echo "cat /test/$$file2.out" >>"$(DIST_PATH)/test/run_all"; \
    80                 echo "cp -f /test/$$file2.out /data/web/result-$$file2.txt" >>"$(DIST_PATH)/test/run_all"; \
    81                 echo "<li><a href=\"result-$$file2.txt\">$$file2</a></li>" >>"$(DIST_PATH)/test/test.html"; \
    82         done
    83         echo "cp -f /test/test.html /data/web/test.html" >>"$(DIST_PATH)/test/run_all"
    84         echo "</ul></body></html>" >>"$(DIST_PATH)/test/test.html"
    85 endif
    86 
    8770        for drv in $(RD_DRVS) ; do \
    8871                drv_dir="`dirname "$$drv"`" ; \
    … …  
    117100        rm -rf $(USPACE_PATH)/dist/inc/*
    118101        rm -f $(USPACE_PATH)/dist/app/*
    119         rm -f $(USPACE_PATH)/dist/test/*
    120102        rm -f $(USPACE_PATH)/dist/cfg/net/*

  • boot/Makefile.common

    r15d0046 r105d8d6  
    221221        $(USPACE_PATH)/app/fontviewer/fontviewer
    222222
    223 RD_TESTS = \
    224         $(USPACE_PATH)/lib/c/test-libc \
    225         $(USPACE_PATH)/lib/posix/test-libposix \
    226         $(USPACE_PATH)/app/bdsh/test-bdsh
    227 
    228 
    229223COMPONENTS = \
    230224        $(KERNEL_PATH)/kernel.bin \

  • uspace/Makefile

    r15d0046 r105d8d6  
    236236        lib/gpt
    237237
    238 ifeq ($(CONFIG_PCUT_TESTS),y)
    239         LIBS += lib/pcut
    240 endif
    241 
    242238LIBC_BUILD = $(addsuffix .build,$(LIBC))
    243239LIBS_BUILD = $(addsuffix .build,$(LIBS))
    244240LIBN_BUILD = $(addsuffix .build,$(LIBN))
    245241BUILDS := $(addsuffix .build,$(DIRS))
    246 BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) lib/c)
    247242
    248243CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC))
    … …  
    250245.PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean
    251246
    252 all: $(BUILDS) $(BUILDS_TESTS)
    253 
    254 $(BUILDS_TESTS): $(BUILDS)
    255         $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK)
     247all: $(BUILDS)
    256248
    257249clean: $(CLEANS)

  • uspace/Makefile.common

    r15d0046 r105d8d6  
    7878        JOB = $(BINARY).job
    7979        OUTPUT = $(BINARY)
    80         TEST_BINARY = test-$(BINARY)
    8180        EXTRA_OUTPUT += $(BINARY).disasm
    8281        EXTRA_CLEAN += $(BINARY).map
    … …  
    8685        JOB = $(LIBRARY).job
    8786        OUTPUT = $(LIBRARY).a
    88         TEST_BINARY = test-$(LIBRARY)
    8987endif
    9088
    … …  
    202200endif
    203201
    204 # PCUT-based unit tests
    205 ifeq ($(CONFIG_PCUT_TESTS),y)
    206 ifneq ($(TEST_SOURCES),)
    207         TEST_OUTPUT = $(TEST_BINARY)
    208         TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__
    209         TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
    210         EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map
    211 ifneq ($(LIBRARY),)
    212         TEST_OUTPUT_LIBS += $(OUTPUT)
    213 endif
    214         TEST_OUTPUT_LIBS += $(TEST_LIBS)
    215 endif
    216 endif
    217 
    218202.PHONY: all clean
    219203
    220204all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
    221205        -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
    222 
    223 all-test: $(TEST_OUTPUT)
    224206
    225207clean:
    … …  
    312294OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    313295LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
    314 TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES)))
    315296
    316297ifneq ($(BINARY),)
    … …  
    357338endif
    358339
    359 ifeq ($(CONFIG_PCUT_TESTS),y)
    360 ifneq ($(TEST_OUTPUT),)
    361 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
    362         $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
    363 ifeq ($(CONFIG_STRIP_BINARIES),y)
    364         $(STRIP) $(TEST_OUTPUT)
    365 endif
    366 endif
    367 endif
    368 
    369340%.o: %.S $(DEPEND)
    370341        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
    … …  
    385356endif
    386357
    387 %.test.o: %.c $(DEPEND)
    388         $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@
    389 ifeq ($(PRECHECK),y)
    390         $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
    391 endif
    392 
    393358%.lo: %.S $(DEPEND)
    394359        $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
    … …  
    410375
    411376$(DEPEND): $(PRE_DEPEND)
    412         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
     377        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
    413378        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
    414379

  • uspace/app/bdsh/Makefile

    r15d0046 r105d8d6  
    6565        tok.c
    6666
    67 TEST_SOURCES = \
    68         tok.c \
    69         test/toktest.c
    70 
    7167include $(USPACE_PREFIX)/Makefile.common

  • uspace/lib/c/Makefile

    r15d0046 r105d8d6  
    165165        $(ARCH_SOURCES)
    166166
    167 TEST_SOURCES = \
    168         test/main.c \
    169         test/sprintf.c
    170 
    171167include $(USPACE_PREFIX)/Makefile.common
    172168

  • uspace/lib/posix/Makefile

    r15d0046 r105d8d6  
    7979        source/unistd.c
    8080
    81 TEST_SOURCES = \
    82         test/main.c \
    83         test/scanf.c
    84 
    8581include $(USPACE_PREFIX)/Makefile.common
    8682
Note: See TracChangeset for help on using the changeset viewer.